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
..
embed	Update jquery to 3.2.1.	2017-04-21 11:20:40 +03:00
main	Merge branch 'develop' into feature/desktop-new	2018-02-22 02:41:49 +03:00
mobile	Fix Bug 35517.	2017-08-18 13:12:18 +03:00
Analytics.js	merge with default	2017-01-23 14:04:37 +03:00
Gateway.js	Added "Close File" button to the password dialog. Send api event "onRequestClose" when Close File (or Esc) is selected.	2018-02-06 13:54:40 +03:00
IrregularStack.js	change license to 2017	2017-01-17 17:58:08 +03:00
locale.js	Support for languages with "_" separator (en_US).	2018-01-24 14:40:59 +03:00