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
..
controller	Merge branch 'release/v5.3.0' into develop	2019-05-22 16:02:54 +03:00
template	Merge into develop from release/v5.3.0	2019-03-29 13:05:29 +03:00
view	[de] Sailfish scroll support	2019-03-19 15:39:51 +03:00