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	Fix Bug 35626.	2017-08-17 15:39:28 +03:00
component	Merge branch 'develop' into feature/desktop-new	2018-02-02 16:18:07 +03:00
controller	Merge branch 'hotfix/v5.0.7' into develop	2018-01-15 16:11:11 +03:00
core	change license to 2017	2017-01-17 17:58:08 +03:00
extend	[SSE] Apply bullets and numbering to text in shape (need changes in api).	2017-05-18 10:31:18 +03:00
model	Added groups for plugins.	2017-12-07 17:46:13 +03:00
mods	Fix Bug 35896.	2017-09-28 14:02:33 +03:00
template	Fix Bug 35896.	2017-09-28 14:02:33 +03:00
util	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