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	Merge branch 'release/v6.3.0' into develop	2021-04-29 23:31:07 +03:00
resources	Merge branch 'release/v6.3.0' into develop	2021-04-29 23:31:07 +03:00
app.js	[PE] Show version history	2021-03-24 10:39:09 +03:00
app.reporter.js	Refactoring skin for reporter	2021-04-27 19:26:33 +03:00
app_dev.js	[PE] Show version history	2021-03-24 10:39:09 +03:00
app_dev.reporter.js	Refactoring skin for reporter	2021-04-27 19:26:33 +03:00
index.html	[all] fix bug 49886	2021-04-24 21:23:24 +03:00
index.html.deploy	[all] fix bug 49886	2021-04-24 21:23:24 +03:00
index.reporter.html	[all] fix skeleton stylesheets for IE	2021-02-22 17:23:58 +03:00
index.reporter.html.deploy	[all] fix skeleton stylesheets for IE	2021-02-22 17:23:58 +03:00
index_loader.html	For Bug 47092	2021-03-30 16:30:01 +03:00
index_loader.html.deploy	Change new file panel	2020-06-18 14:43:26 +03:00