Maxim Kadushkin 482a7d11bf Merge branch 'develop' into feature/desktop-new ... # Conflicts: # apps/documenteditor/main/app/controller/Main.js # apps/documenteditor/main/app/controller/Toolbar.js # apps/presentationeditor/main/app/controller/Main.js # apps/spreadsheeteditor/main/app/controller/Main.js		2018-02-22 02:41:49 +03:00
..
app	Merge branch 'develop' into feature/desktop-new	2018-02-22 02:41:49 +03:00
locale	Merge branch 'develop' into develop	2018-02-21 16:56:59 +03:00
resources	Merge branch 'develop' into feature/desktop-new	2018-02-22 02:41:49 +03:00
app.js	[common] added 'Desktop' controller	2018-02-22 02:24:03 +03:00
app_dev.js	[common] added 'Desktop' controller	2018-02-22 02:24:03 +03:00
index.html	Don't support IE version <10.	2018-02-20 13:45:35 +03:00
index.html.deploy	Merge branch 'develop' into feature/desktop-new	2018-02-22 02:41:49 +03:00