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
..
app	Merge branch 'develop' into feature/colors-table	2021-02-06 14:42:56 +03:00
locale	Merge branch 'develop' into feature/colors-table	2021-02-06 14:42:56 +03:00
resources	Merge branch 'develop' into feature/colors-table	2021-02-06 14:42:56 +03:00
app.js	[dark theme] added 'Themes' controller	2021-02-06 13:03:46 +03:00
app_dev.js	[dark theme] added 'Themes' controller	2021-02-06 13:03:46 +03:00
index.html	Merge branch 'develop' into feature/colors-table	2021-02-06 14:42:56 +03:00
index.html.deploy	Merge branch 'develop' into feature/colors-table	2021-02-06 14:42:56 +03:00
index_loader.html	Change new file panel	2020-06-18 14:43:26 +03:00
index_loader.html.deploy	Change new file panel	2020-06-18 14:43:26 +03:00