Maxim Kadushkin f62aa45b18 Merge branch 'develop' into feature/multiZoom5.5 ... # Conflicts: # apps/common/main/resources/img/toolbar/1x/big/.css.handlebars # apps/common/main/resources/less/asc-mixins.less # apps/common/main/resources/less/buttons.less # apps/common/main/resources/less/checkbox.less # apps/common/main/resources/less/combo-dataview.less # apps/common/main/resources/less/comments.less # apps/common/main/resources/less/common.less # apps/common/main/resources/less/dataview.less # apps/common/main/resources/less/dropdown-menu.less # apps/common/main/resources/less/listview.less # apps/common/main/resources/less/multislider-gradient.less # apps/common/main/resources/less/radiobox.less # apps/common/main/resources/less/scroller.less # apps/common/main/resources/less/separator.less # apps/common/main/resources/less/theme-colorpalette.less # apps/common/main/resources/less/toolbar.less # apps/common/main/resources/less/window.less # apps/documenteditor/main/resources/less/advanced-settings.less # apps/documenteditor/main/resources/less/filemenu.less # apps/documenteditor/main/resources/less/leftmenu.less # apps/documenteditor/main/resources/less/rightmenu.less # apps/documenteditor/main/resources/less/statusbar.less # apps/documenteditor/main/resources/less/toolbar.less # apps/presentationeditor/main/resources/less/leftmenu.less # apps/presentationeditor/main/resources/less/rightmenu.less # apps/presentationeditor/main/resources/less/statusbar.less # apps/spreadsheeteditor/main/resources/less/celleditor.less # apps/spreadsheeteditor/main/resources/less/leftmenu.less # apps/spreadsheeteditor/main/resources/less/rightmenu.less # apps/spreadsheeteditor/main/resources/less/statusbar.less # apps/spreadsheeteditor/main/resources/less/toolbar.less		2021-02-10 15:40:30 +03:00
..
app	Merge branch 'develop' into feature/multiZoom5.5	2021-02-10 15:40:30 +03:00
locale	Merge branch 'develop' into feature/colors-table	2021-02-06 14:42:56 +03:00
resources	Merge branch 'develop' into feature/multiZoom5.5	2021-02-10 15:40:30 +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/multiZoom5.5	2021-02-10 15:40:30 +03:00
index.html.deploy	Merge branch 'develop' into feature/colors-table	2021-02-06 14:42:56 +03:00
index_internal.html	[dark theme] keep theme name for next session	2021-02-02 15:37:00 +03:00
index_internal.html.deploy	[dark theme] changed script for deployment	2021-02-06 13:08:20 +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