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	Merge into develop from release/v5.3.0	2019-03-29 13:05:29 +03:00
test	[copyright] Update Copyright	2019-01-17 16:05:03 +03:00
app-dev.js	[DE Mobile] Add header/footer settings	2019-02-15 16:39:39 +03:00
app.js	Merge branch 'develop' into feature/flex-production	2019-03-04 12:15:39 +03:00
index.html	[all] refactoring	2019-04-02 16:23:47 +03:00
index.html.deploy	[all] refactoring	2019-04-02 16:23:47 +03:00