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
..
application.js	[Embedded] Fix loading translations	2019-09-17 18:23:35 +03:00
ApplicationController.js	Merge branch 'develop' into feature/Bug_45361	2020-09-22 16:40:22 +03:00
ApplicationView.js	[embed] fix bug 33455	2020-09-08 20:40:18 +03:00