AlexeySafronov 25ac98e272 Merge branch 'develop' into feature/translations ... # Conflicts: # products/ASC.Files/Client/public/locales/en/DeleteDialog.json # products/ASC.Files/Client/public/locales/en/Home.json # products/ASC.Files/Client/public/locales/ru/DeleteDialog.json # products/ASC.Files/Client/public/locales/ru/Home.json		2021-05-27 11:13:41 +03:00
..
ASC.Calendar	Merge branch 'develop' into feature/translations	2021-05-20 13:11:13 +03:00
ASC.CRM	Merge branch 'develop' into feature/translations	2021-05-20 13:11:13 +03:00
ASC.Files	Merge branch 'develop' into feature/translations	2021-05-27 11:13:41 +03:00
ASC.Mail	Merge branch 'develop' into feature/translations	2021-05-20 13:11:13 +03:00
ASC.People	Web: fixed ns	2021-05-27 11:00:13 +03:00
ASC.Projects	Merge branch 'develop' into feature/translations	2021-05-20 13:11:13 +03:00