Artem Tarasov 55198d0e7f Merge branch 'develop' into feature/doceditor-ssr ... # Conflicts: # web/ASC.Web.Editor/src/i18n.js # web/ASC.Web.Editor/webpack.config.js # yarn.lock		2022-07-10 11:23:44 +03:00
..
ASC.Calendar	Merge branch 'release/v1.2' into develop	2022-07-07 17:41:41 +03:00
ASC.CRM	Merge branch 'release/v1.2' into develop	2022-07-07 17:41:41 +03:00
ASC.Files	Merge branch 'develop' into feature/doceditor-ssr	2022-07-10 11:23:44 +03:00
ASC.Mail	Merge branch 'release/v1.2' into develop	2022-07-07 17:41:41 +03:00
ASC.People	Merge branch 'release/v1.2' into develop	2022-07-07 17:41:41 +03:00
ASC.Projects	Merge branch 'release/v1.2' into develop	2022-07-07 17:41:41 +03:00