Alexander Yuzhin 5b64926d5c Merge commit 'e607c5f27951c17100daae92ac741081d73ac4aa' into develop ... # Conflicts: # apps/documenteditor/mobile/app/view/Settings.js # apps/documenteditor/mobile/locale/en.json		2019-02-15 14:16:59 +03:00
..
controller	Merge commit 'e607c5f27951c17100daae92ac741081d73ac4aa' into develop	2019-02-15 14:16:59 +03:00
template	Merge commit 'e607c5f27951c17100daae92ac741081d73ac4aa' into develop	2019-02-15 14:16:59 +03:00
view	Merge commit 'e607c5f27951c17100daae92ac741081d73ac4aa' into develop	2019-02-15 14:16:59 +03:00