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
..
collection	[PE] Fix Bug 36519.	2018-01-09 16:59:20 +03:00
controller	Merge branch 'develop' into feature/desktop-new	2018-02-22 02:41:49 +03:00
model	change license to 2017	2017-01-17 17:58:08 +03:00
template	Merge branch 'develop' into feature/desktop-new	2018-02-13 11:26:16 +03:00
view	Merge branch 'develop' into feature/desktop-new	2018-02-22 02:41:49 +03:00