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
..
1.5x	Merge branch 'release/v6.3.0' into develop	2021-04-29 23:31:07 +03:00
1.25x	[DE] Add icons	2021-04-20 11:46:03 +03:00
1.75x	[DE] Add icons	2021-04-20 11:46:03 +03:00
1x	[DE] Add icons	2021-04-20 11:46:03 +03:00
2x	[DE] Add icons	2021-04-20 11:46:03 +03:00
contents.png	[DE] Fix Bug 43931 (#337)	2020-02-11 15:22:30 +03:00
contents@2x.png	[DE] Fix Bug 43931 (#337)	2020-02-11 15:22:30 +03:00
text_styles.png	webapps added	2016-03-10 21:48:53 -03:00