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
..
app	Merge branch 'release/v6.3.0' into develop	2021-04-29 23:31:07 +03:00
locale	Update translation	2021-04-23 16:24:35 +03:00
resources	[SSE mobile] Fix Bug 48367	2021-01-22 14:26:41 +03:00
app-dev.js	[DE PE SSE] correct paths	2020-02-11 12:59:28 +03:00
app.js	[DE PE SSE] correct paths	2020-02-11 12:59:28 +03:00
index.html	[SSE] Fixed display horizontal green lines on skeleton	2020-08-28 14:04:21 +03:00
index.html.deploy	[SSE] Fixed display horizontal green lines on skeleton	2020-08-28 14:04:21 +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