Maxim Kadushkin c8e9fe9a63 Merge branch 'develop' into feature/desktop-new ... # Conflicts: # apps/common/main/lib/util/utils.js		2018-02-02 16:18:07 +03:00
..
collection	[PE] Fix Bug 36519.	2018-01-09 16:59:20 +03:00
controller	Merge branch 'develop' into feature/desktop-new	2018-02-02 16:18:07 +03:00
model	change license to 2017	2017-01-17 17:58:08 +03:00
template	Merge branch 'develop' into feature/desktop-new	2018-02-02 16:18:07 +03:00
view	Merge branch 'develop' into feature/desktop-new	2018-02-02 16:18:07 +03:00