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
..
collection	Merge branch 'hotfix/v5.2.8' into develop	2019-02-05 16:43:52 +03:00
component	Merge branch 'develop' into feature/Bug_45361	2020-09-22 16:40:22 +03:00
controller	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
core	[SSE] Fix Bug 46126	2020-08-14 16:58:41 +03:00
extend	Update bootstrap (dropdown menu)	2020-09-03 18:43:03 +03:00
model	Add userdata field to comments	2020-08-31 14:27:54 +03:00
mods	Fix bug 43076, Bug 43119, Bug 43074	2019-10-11 10:59:16 +03:00
template	[SSE] Add autoformat settings	2020-09-07 23:18:16 +03:00
util	Merge branch 'develop' into feature/Bug_45361	2020-09-22 16:40:22 +03:00
view	Merge branch 'develop' into feature/Bug_45361	2020-09-22 16:40:22 +03:00