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
..
.bowerrc	webapps added	2016-03-10 21:48:53 -03:00
bower.json	webapps added	2016-03-10 21:48:53 -03:00
common.json	[build][cosmetic] Prevent file changing after build	2019-04-08 12:06:57 +03:00
documenteditor.json	[build][cosmetic] Prevent file changing after build	2019-04-08 12:06:57 +03:00
Gruntfile.js	Merge branch 'release/v5.3.0' into develop	2019-05-22 16:02:54 +03:00
package.json	Add json minify task	2018-04-09 15:02:13 +03:00
presentationeditor.json	[build][cosmetic] Prevent file changing after build	2019-04-08 12:06:57 +03:00
spreadsheeteditor.json	[build][cosmetic] Prevent file changing after build	2019-04-08 12:06:57 +03:00