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
..
app	Merge branch 'develop' into feature/Bug_45361	2020-09-22 16:40:22 +03:00
locale	[DE] Fix Bug 46598	2020-09-22 00:01:04 +03:00
resources	Merge branch 'develop' into feature/Bug_45361	2020-09-22 16:40:22 +03:00
app.js	[DE] Fix loading translations on IE and minimized version	2019-09-17 18:24:43 +03:00
app_dev.js	[common] Update bootstrap (fix tooltip)	2020-07-21 22:42:05 +03:00
index.html	Fix skeleton scale: don't add zoom for mobile devices	2020-08-26 17:24:52 +03:00
index.html.deploy	Fix skeleton scale: don't add zoom for mobile devices	2020-08-26 17:24:52 +03:00
index_loader.html	Change new file panel	2020-06-18 14:43:26 +03:00
index_loader.html.deploy	Change new file panel	2020-06-18 14:43:26 +03:00