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
..
img	Merge branch 'develop' into feature/desktop-new	2018-02-22 02:41:49 +03:00
less	Merge branch 'develop' into feature/desktop-new	2018-02-22 02:41:49 +03:00