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
..
collection	[SSE] Change applying conditional format presets	2021-03-03 00:30:04 +03:00
controller	Merge branch 'release/v6.3.0' into develop	2021-04-29 23:31:07 +03:00
model	[SSE] Formula dialog: add 10 last used functions. Refactoring.	2019-05-27 16:19:48 +03:00
template	Merge branch 'release/v6.3.0' into develop	2021-04-29 23:31:07 +03:00
view	Merge branch 'release/v6.3.0' into develop	2021-04-29 23:31:07 +03:00