Maxim Kadushkin 97474af94d Merge branch 'release/v6.3.0' into develop ... # Conflicts: # apps/common/main/lib/controller/Plugins.js # apps/common/main/lib/view/Header.js # apps/documenteditor/main/app/controller/Main.js # apps/documenteditor/main/app/view/ParagraphSettingsAdvanced.js # apps/documenteditor/main/app/view/Toolbar.js # apps/documenteditor/main/locale/sl.json # apps/presentationeditor/main/app/view/ParagraphSettingsAdvanced.js # apps/presentationeditor/main/locale/ja.json # apps/spreadsheeteditor/main/app/controller/Main.js # apps/spreadsheeteditor/main/app/template/Toolbar.template # apps/spreadsheeteditor/main/app/view/ParagraphSettingsAdvanced.js		2021-04-29 23:31:07 +03:00
..
collection	[copyright] Update Copyright	2019-01-17 16:05:03 +03:00
controller	Merge branch 'release/v6.3.0' into develop	2021-04-29 23:31:07 +03:00
model	[copyright] Update Copyright	2019-01-17 16:05:03 +03:00
template	[Mobile] For Bug 47143	2020-11-19 20:08:29 +03:00
view	Use sdk class	2021-03-26 14:29:16 +03:00