pavelbannov 8ea04bcc81 Merge branch 'develop' into feature/12.0 ... # Conflicts: # common/ASC.MessagingSystem/Data/MessagesRepository.cs # products/ASC.Files/Core/Utils/FileConverter.cs		2022-06-17 19:19:00 +03:00
..
DbAzService.cs	Merge branch 'develop' into feature/12.0	2022-06-17 19:19:00 +03:00
DbLoginEventsManager.cs	moved from ddf515b8	2022-06-16 17:16:46 +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