Maxim Kadushkin c8e9fe9a63 Merge branch 'develop' into feature/desktop-new ... # Conflicts: # apps/common/main/lib/util/utils.js		2018-02-02 16:18:07 +03:00
..
app	Merge branch 'develop' into feature/desktop-new	2018-02-02 16:18:07 +03:00
locale	Added support for force save errors.	2018-01-26 15:39:21 +03:00
resources	Fix Bug 36523.	2018-01-22 14:35:40 +03:00
app.js	[PE] Added Protection tab. Changed signature settings in the right and left menu.	2017-11-28 15:39:36 +03:00
app.reporter.js	[PE] Bug with opening presenter view.	2017-10-23 12:06:27 +03:00
app_dev.js	[PE] Added Protection tab. Changed signature settings in the right and left menu.	2017-11-28 15:39:36 +03:00
app_dev.reporter.js	[PE] Bug with opening presenter view.	2017-10-23 12:06:27 +03:00
index.html	Support for languages with "_" separator (en_US).	2018-01-24 14:40:59 +03:00
index.html.deploy	Merge pull request #49 from ONLYOFFICE/master	2018-01-25 18:09:03 +03:00
index.reporter.html	Support for languages with "_" separator (en_US).	2018-01-24 14:40:59 +03:00
index.reporter.html.deploy	Support for languages with "_" separator (en_US).	2018-01-24 14:40:59 +03:00