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	[all] fix compiled app launch	2021-02-13 13:05:16 +03:00
app_dev.js	[dark theme] added 'Themes' controller	2021-02-06 13:03:46 +03:00
index.html	Merge branch 'release/v6.3.0' into develop	2021-04-29 23:31:07 +03:00
index.html.deploy	Merge branch 'release/v6.3.0' into develop	2021-04-29 23:31:07 +03:00
index_internal.html	[all] fix skeleton stylesheets for IE	2021-02-22 17:23:58 +03:00
index_internal.html.deploy	[all] fix skeleton stylesheets for IE	2021-02-22 17:23:58 +03:00
index_loader.html	Merge pull request #779 from ONLYOFFICE/release/v6.3.0	2021-04-02 11:53:39 +03:00
index_loader.html.deploy	[SSE] Add presets for conditional formatting	2021-02-25 18:45:24 +03:00