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
..
collection	Merge branch 'hotfix/v5.2.8' into develop	2019-02-05 16:43:52 +03:00
component	[DE] Change synchronize tip: show at the bottom of toolbar	2021-02-08 19:19:19 +03:00
controller	Merge branch 'develop' into feature/colors-table	2021-02-06 14:42:56 +03:00
core	[SSE] Fix Bug 46126	2020-08-14 16:58:41 +03:00
extend	Fix Bug 43332 (#258)	2019-10-29 15:32:13 +03:00
model	Add new parameters to "permissions" section of config: editCommentAuthorOnly (can edit your own comments only if true), deleteCommentAuthorOnly (can delete your own comments only if true).	2021-02-04 12:39:56 +03:00
mods	Fix bug 43076, Bug 43119, Bug 43074	2019-10-11 10:59:16 +03:00
template	Merge branch 'develop' into feature/colors-table	2021-02-06 14:42:56 +03:00
util	Merge branch 'develop' into feature/multiZoom5.5	2021-02-10 15:40:30 +03:00
view	Merge branch 'develop' into feature/colors-table	2021-02-06 14:42:56 +03:00