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
..
api	Wopi fix	2021-04-28 19:58:11 +03:00
common	Merge branch 'release/v6.3.0' into develop	2021-04-29 23:31:07 +03:00
documenteditor	Merge branch 'release/v6.3.0' into develop	2021-04-29 23:31:07 +03:00
presentationeditor	Merge branch 'release/v6.3.0' into develop	2021-04-29 23:31:07 +03:00
spreadsheeteditor	Merge branch 'release/v6.3.0' into develop	2021-04-29 23:31:07 +03:00