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
..
1.5x	Merge branch 'develop' into feature/multiZoom5.5	2021-02-10 15:40:30 +03:00
1.25x	Update icons	2021-02-05 16:41:12 +03:00
1.75x	Update icons	2021-02-05 16:41:12 +03:00
1x	Merge branch 'develop' into feature/multiZoom5.5	2021-02-10 15:40:30 +03:00
2x	Merge branch 'develop' into feature/multiZoom5.5	2021-02-10 15:40:30 +03:00
bullets-and-numbering.png	Move common icons.	2018-02-20 15:29:01 +03:00
bullets-and-numbering@2x.png	Move common icons.	2018-02-20 15:29:01 +03:00
charttypes.svg	Merge branch 'develop' into feature/colors-table	2021-02-06 14:42:56 +03:00
math.png	Move common icons.	2018-02-20 15:29:01 +03:00
math@2x.png	Move common icons.	2018-02-20 15:29:01 +03:00
shapetypes.svg	Use svg icons for autoshapes	2019-04-01 16:10:35 +03:00