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
..
resources/templates	webapps added	2016-03-10 21:48:53 -03:00
api.js	Merge branch 'develop' into feature/colors-table	2021-02-06 14:42:56 +03:00
cache-scripts.html	[all] Move	2020-02-18 15:58:37 +03:00
index.html.desktop	settings for "review" mode	2020-10-22 10:14:20 +03:00