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
..
DocumentHolder.js	[PE] Fix Bug 42915	2020-01-27 18:06:26 +03:00
LeftMenu.js	Merge branch 'release/v6.3.0' into develop	2021-04-29 23:31:07 +03:00
Main.js	Merge branch 'release/v6.3.0' into develop	2021-04-29 23:31:07 +03:00
RightMenu.js	[PE] switch to dark theme	2020-12-21 13:31:46 +03:00
Statusbar.js	[PE] Refactoring language button	2019-07-15 17:57:46 +03:00
Toolbar.js	Merge branch 'release/v6.3.0' into develop	2021-04-29 23:31:07 +03:00
Viewport.js	[PE] FIx hiding notes	2021-04-27 00:04:35 +03:00