TatianaLopaeva 0663ed7f16 Merge branch 'develop' into feature/backup ... # Conflicts: # packages/asc-web-common/api/settings/index.js # web/ASC.Web.Client/public/locales/en/Settings.json # web/ASC.Web.Client/public/locales/ru/Settings.json		2021-06-10 11:56:32 +03:00
..
ASC.Calendar	Merge branch 'develop' into feature/remove-unused-dep	2021-06-03 12:52:21 +03:00
ASC.CRM	Merge branch 'develop' into feature/remove-unused-dep	2021-06-03 12:52:21 +03:00
ASC.Files	Merge branch 'develop' into feature/backup	2021-06-08 15:03:49 +03:00
ASC.Mail	Merge branch 'develop' into feature/remove-unused-dep	2021-06-03 12:52:21 +03:00
ASC.People	Web: People: change trans on t	2021-06-08 16:09:51 +03:00
ASC.Projects	Merge branch 'develop' into feature/remove-unused-dep	2021-06-03 12:52:21 +03:00