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-15 11:18:07 +03:00
1.25x	Merge branch 'release/v6.3.0' into develop	2021-04-02 17:33:33 +03:00
1.75x	Merge branch 'release/v6.3.0' into develop	2021-04-02 17:33:33 +03:00
1x	Merge branch 'release/v6.3.0' into develop	2021-04-02 17:33:33 +03:00
2x	Merge branch 'release/v6.3.0' into develop	2021-04-02 17:33:33 +03:00
BorderSize.png	Fix Bug 43986	2020-04-03 20:21:00 +03:00
BorderSize@1.5x.png	[web-apps] fix bug 50030	2021-04-28 14:10:39 +03:00
BorderSize@2x.png	Fix Bug 43986	2020-04-03 20:21:00 +03:00