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
..
DbAzService.cs	Merge branch 'develop' into feature/12.0	2022-06-17 19:19:00 +03:00
DbLoginEventsManager.cs	Merge branch 'develop' into feature/migrations-fix	2022-07-14 11:56:07 +03:00
DbQuotaService.cs	Merge branch 'develop' into feature/12.0	2022-06-17 19:19:00 +03:00
DbSettingsManager.cs	merge from develop	2022-06-01 14:44:30 +03:00
DbSubscriptionService.cs	dbcontext: EnableRetryOnFailure for MySQL provider	2022-05-25 16:55:38 +03:00
DbTenantService.cs	Merge branch 'develop' into feature/12.0	2022-06-17 19:19:00 +03:00
DbUserService.cs	Merge branch 'develop' into feature/12.0	2022-06-17 19:19:00 +03:00