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
..
embed	Update common.less	2020-09-09 15:25:14 +03:00
main	Merge branch 'release/v6.3.0' into develop	2021-04-29 23:31:07 +03:00
mobile	Merge branch 'release/v6.3.0' into develop	2021-04-15 11:18:07 +03:00
Analytics.js	[copyright] Update Copyright	2019-01-17 16:05:03 +03:00
Gateway.js	Merge branch 'fix/request-close' into develop	2021-03-30 15:34:56 +03:00
IrregularStack.js	[copyright] Update Copyright	2019-01-17 16:05:03 +03:00
locale.js	[all] debug locked file open	2020-04-29 20:54:48 +03:00