Julia Radzhabova b54c2e4d10 Merge branch 'develop' into feature/sse-conditional-formatting ... # Conflicts: # apps/spreadsheeteditor/main/app/controller/Toolbar.js		2020-05-15 14:29:20 +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/sse-conditional-formatting	2020-05-15 14:29:20 +03:00
controller	[all] debug locked file open	2020-04-29 20:54:48 +03:00
core	[copyright] Update Copyright	2019-01-17 16:05:03 +03:00
extend	Fix Bug 43332 (#258)	2019-10-29 15:32:13 +03:00
model	[Comments] Use original guid for comment mentions	2019-07-16 15:50:55 +03:00
mods	Fix bug 43076, Bug 43119, Bug 43074	2019-10-11 10:59:16 +03:00
template	Fix Bug 44918	2020-04-15 15:17:51 +03:00
util	Merge branch 'develop' into feature/sse-conditional-formatting	2020-05-15 14:29:20 +03:00
view	Merge pull request #396 from ONLYOFFICE/hotfix/v5.5.3	2020-05-08 13:06:21 +03:00