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
..
about	[common] fix bug 44009, added logo for dark theme	2021-04-06 16:21:55 +03:00
combo-border-size	Align border preview by left side	2021-04-21 17:59:59 +03:00
controls	[common] fix bug 50025	2021-04-28 15:32:20 +03:00
dimension-picker	[common] added some 1.5x icons	2019-12-06 18:19:43 +03:00
doc-formats	[DE] Add new formats for downloading: fb2, html, epub	2021-02-08 21:22:14 +03:00
header	[all] fixed logo on bundled app version	2021-03-31 19:52:05 +03:00
hsbcolorpicker	[common] added some 1.5x icons	2019-12-06 18:19:43 +03:00
load-mask	[common] removed svg animation in loading mask image	2020-11-10 23:48:00 +03:00
plugin	[DE] Панель плагинов изменена в соответствии с макетами.	2016-06-29 10:58:10 +03:00
right-panels	[common] added some 1.5x icons	2019-12-06 18:19:43 +03:00
toolbar	Merge branch 'release/v6.3.0' into develop	2021-04-15 11:18:07 +03:00