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
..
js	Merge branch 'develop' into feature/Bug_45361	2020-09-22 16:40:22 +03:00
locale	Merge branch 'release/v6.0.0' into develop	2020-09-17 18:26:57 +03:00
resources/less	webapps added	2016-03-10 21:48:53 -03:00
index.html	[SSE] Fixed display horizontal green lines on skeleton	2020-08-28 14:04:21 +03:00
index.html.deploy	[SSE] Fixed display horizontal green lines on skeleton	2020-08-28 14:04:21 +03:00
index_loader.html	Check origin in messages	2020-03-19 17:38:09 +03:00
index_loader.html.deploy	Check origin in messages	2020-03-19 17:38:09 +03:00