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
..
toolbar	Merge branch 'release/v6.3.0' into develop	2021-04-29 23:31:07 +03:00
blank.svg	Change new file panel	2020-06-18 14:43:26 +03:00
favicon.ico	webapps added	2016-03-10 21:48:53 -03:00
file-template.svg	Change new file panel	2020-06-18 14:43:26 +03:00
logo.png	[DE] repaired header	2017-03-01 16:33:12 +03:00
recent-file.svg	Fix recent icons	2020-06-15 12:23:37 +03:00