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
..
about	[common] changed markup for logo on 'about' page	2018-10-25 17:44:06 +03:00
combo-border-size	Fix Bug 43986	2020-04-03 20:21:00 +03:00
controls	[SSE] Fix Bug 48118	2020-12-25 14:50:01 +03:00
dimension-picker	[common] added some 1.5x icons	2019-12-06 18:19:43 +03:00
doc-formats	Change new file panel	2020-06-18 14:43:26 +03:00
header	[common] removed 'undock' button from header	2020-07-29 23:06:01 +03:00
hsbcolorpicker	[common] added some 1.5x icons	2019-12-06 18:19:43 +03:00
load-mask	[common] removed svg animation in loading mask image	2020-11-10 23:48:00 +03:00
plugin	[DE] Панель плагинов изменена в соответствии с макетами.	2016-06-29 10:58:10 +03:00
right-panels	[common] added some 1.5x icons	2019-12-06 18:19:43 +03:00
toolbar	Merge branch 'develop' into feature/colors-table	2021-02-06 14:42:56 +03:00