Maxim Kadushkin 1407e01f4c Merge branch 'develop' into feature/svg-icons ... # Conflicts: # apps/documenteditor/main/index.html		2019-10-07 16:55:17 +03:00
..
collection	Merge branch 'hotfix/v5.2.8' into develop	2019-02-05 16:43:52 +03:00
component	Merge branch 'develop' into feature/svg-icons	2019-10-07 16:55:17 +03:00
controller	Merge branch 'develop' into feature/optimization	2019-09-18 16:32:26 +03:00
core	[copyright] Update Copyright	2019-01-17 16:05:03 +03:00
extend	[SSE] Formula tab: fix position for menu item 'Additional' in More button	2019-08-13 13:28:06 +03:00
model	[Comments] Use original guid for comment mentions	2019-07-16 15:50:55 +03:00
mods	Add patch for perfect-scroll	2019-04-19 17:56:42 +03:00
template	Merge branch 'feature/comment-mentions' into develop	2019-07-12 17:00:29 +03:00
util	Merge branch 'develop' into feature/svg-icons	2019-10-07 16:55:17 +03:00
view	Merge branch 'develop' into feature/svg-icons	2019-10-07 16:55:17 +03:00