JuliaSvinareva 79e931df10 Merge branch 'develop' into feature/Bug_45361 ... # Conflicts: # apps/common/main/lib/component/ColorButton.js # apps/common/main/lib/component/Menu.js # apps/common/main/resources/less/header.less # apps/documenteditor/main/app/view/Toolbar.js # apps/presentationeditor/main/app/view/FileMenuPanels.js # apps/spreadsheeteditor/main/app/view/FileMenuPanels.js # apps/spreadsheeteditor/main/app/view/FormulaWizard.js		2020-09-22 16:40:22 +03:00
..
api/documents	Change config parameter documentType: it must take one of the values word/cell/slide (deprecate text/spreadsheet/presentation values).	2020-09-11 16:34:29 +03:00
common	Merge branch 'develop' into feature/Bug_45361	2020-09-22 16:40:22 +03:00
documenteditor	Merge branch 'develop' into feature/Bug_45361	2020-09-22 16:40:22 +03:00
presentationeditor	Merge branch 'develop' into feature/Bug_45361	2020-09-22 16:40:22 +03:00
spreadsheeteditor	Merge branch 'develop' into feature/Bug_45361	2020-09-22 16:40:22 +03:00