Vashchuk Nikita 6507c4b999 Merge branch 'develop' into feature/migrations-fix ... # Conflicts: # products/ASC.Files/Core/Migrations/MySql/FilesDbContextMySql/20211022170840_FilesDbContextMySql.cs # web/ASC.Web.Core/GlobalUsings.cs		2022-07-14 11:56:07 +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/migrations-fix	2022-07-14 11:56:07 +03:00
ASC.Mail	Merge branch 'release/v1.2' into develop	2022-07-07 17:41:41 +03:00
ASC.People	Merge branch 'develop' into feature/migrations-fix	2022-07-14 11:56:07 +03:00
ASC.Projects	Merge branch 'release/v1.2' into develop	2022-07-07 17:41:41 +03:00