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
..
define.js	change license to 2017	2017-01-17 17:58:08 +03:00
LanguageInfo.js	Update language info.	2017-06-01 14:59:35 +03:00
LocalStorage.js	Add method for getting application prefix.	2017-11-28 16:26:11 +03:00
Shortcuts.js	change license to 2017	2017-01-17 17:58:08 +03:00
Tip.js	Fix tip position when the bottom of the tip is greater then browser height.	2017-12-20 14:08:33 +03:00
utils.js	Merge branch 'develop' into feature/desktop-new	2018-02-22 02:41:49 +03:00