Maxim Kadushkin cc7b8102ca Merge branch 'release/v5.3.0' into develop ... # Conflicts: # apps/documenteditor/main/app/controller/Main.js		2019-05-22 16:02:54 +03:00
..
app	Merge branch 'release/v5.3.0' into develop	2019-05-22 16:02:54 +03:00
locale	Merge branch 'release/v5.3.0' into develop	2019-05-22 16:02:54 +03:00
resources
app.js
app_dev.js
index.html	Merge branch 'release/v5.3.0' into develop	2019-05-22 16:02:54 +03:00
index.html.deploy	Merge branch 'release/v5.3.0' into develop	2019-05-22 16:02:54 +03:00