Maxim Kadushkin 5b57ee760b Merge branch 'develop' into feature/colors-table ... # Conflicts: # apps/common/main/resources/less/loadmask.less # apps/documenteditor/main/app/controller/Main.js # apps/documenteditor/main/app/view/FileMenuPanels.js # apps/documenteditor/main/resources/less/toolbar.less # apps/presentationeditor/main/app/controller/Main.js # apps/presentationeditor/main/app/controller/RightMenu.js # apps/presentationeditor/main/app/view/FileMenuPanels.js # apps/presentationeditor/main/app/view/SlideSettings.js # apps/spreadsheeteditor/main/app/controller/Main.js # apps/spreadsheeteditor/main/app/view/FileMenuPanels.js # apps/spreadsheeteditor/main/resources/less/toolbar.less		2021-02-06 14:42:56 +03:00
..
DocumentHolder.js	[PE] Fix Bug 42915	2020-01-27 18:06:26 +03:00
LeftMenu.js	Show beta version label	2020-11-02 23:26:17 +03:00
Main.js	Merge branch 'develop' into feature/colors-table	2021-02-06 14:42:56 +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 'develop' into feature/colors-table	2021-02-06 14:42:56 +03:00
Viewport.js	Merge branch 'develop' into feature/colors-table	2021-02-06 14:42:56 +03:00