Maxim Kadushkin 97474af94d Merge branch 'release/v6.3.0' into develop ... # Conflicts: # apps/common/main/lib/controller/Plugins.js # apps/common/main/lib/view/Header.js # apps/documenteditor/main/app/controller/Main.js # apps/documenteditor/main/app/view/ParagraphSettingsAdvanced.js # apps/documenteditor/main/app/view/Toolbar.js # apps/documenteditor/main/locale/sl.json # apps/presentationeditor/main/app/view/ParagraphSettingsAdvanced.js # apps/presentationeditor/main/locale/ja.json # apps/spreadsheeteditor/main/app/controller/Main.js # apps/spreadsheeteditor/main/app/template/Toolbar.template # apps/spreadsheeteditor/main/app/view/ParagraphSettingsAdvanced.js		2021-04-29 23:31:07 +03:00
..
collection	Merge branch 'hotfix/v5.2.8' into develop	2019-02-05 16:43:52 +03:00
component	Merge branch 'release/v6.3.0' into develop	2021-04-29 23:31:07 +03:00
controller	Merge branch 'release/v6.3.0' into develop	2021-04-29 23:31:07 +03:00
core	[SSE] Fix Bug 46126	2020-08-14 16:58:41 +03:00
extend	[DE] Fix button focus	2021-04-15 01:24:55 +03:00
model	Merge branch 'release/v6.3.0' into develop	2021-04-29 23:31:07 +03:00
mods	Fix bug 43076, Bug 43119, Bug 43074	2019-10-11 10:59:16 +03:00
template	Use config permssions to view comments	2021-03-17 20:08:47 +03:00
util	Move UserInfoParser to sdkjs	2021-04-07 18:04:54 +03:00
view	Merge branch 'release/v6.3.0' into develop	2021-04-29 23:31:07 +03:00