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
..
js	Merge branch 'release/v6.3.0' into develop	2021-04-29 23:31:07 +03:00
locale	Update translation	2021-03-12 20:53:03 +03:00
resources/less	[embed] debug stylesheet	2020-09-08 20:40:54 +03:00
index.html	Check origin in messages	2020-03-19 17:38:09 +03:00
index.html.deploy	Check origin in messages	2020-03-19 17:38:09 +03:00
index.html.opensource	[PE, SSE embed] Translate embedded viewer. Bug 31297	2019-05-14 15:18:18 +03:00
index_loader.html	For Bug 47092	2021-03-30 16:30:01 +03:00
index_loader.html.deploy	Check origin in messages	2020-03-19 17:38:09 +03:00