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
..
collection	[copyright] Update Copyright	2019-01-17 16:05:03 +03:00
controller	Merge branch 'develop' into feature/colors-table	2021-02-06 14:42:56 +03:00
model	[copyright] Update Copyright	2019-01-17 16:05:03 +03:00
template	Hide styles for combined charts	2021-01-30 16:15:25 +03:00
view	Merge branch 'develop' into feature/colors-table	2021-02-06 14:42:56 +03:00