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	[copyright] Update Copyright	2019-01-17 16:05:03 +03:00
controller	Merge branch 'develop' into feature/Bug_45361	2020-09-22 16:40:22 +03:00
model	[SSE] Formula dialog: add 10 last used functions. Refactoring.	2019-05-27 16:19:48 +03:00
template	[SSE] Shape, TextArt settings: add gradient angle	2020-09-10 21:40:54 +03:00
view	Merge branch 'develop' into feature/Bug_45361	2020-09-22 16:40:22 +03:00