pavelbannov bfb9a096e6 Merge branch 'develop' into feature/optimization-queries ... # Conflicts: # common/ASC.Core.Common/Billing/License/LicenseReader.cs # common/ASC.Core.Common/Billing/TariffService.cs # common/ASC.Core.Common/Data/DbAzService.cs # common/ASC.Core.Common/Data/DbQuotaService.cs # common/ASC.Core.Common/Data/DbSubscriptionService.cs # common/ASC.Core.Common/Data/DbTenantService.cs # common/ASC.Core.Common/Data/DbUserService.cs # common/ASC.Data.Backup.Core/Core/DbHelper.cs # common/ASC.Feed/Data/FeedAggregateDataProvider.cs # common/ASC.Feed/Data/FeedReadedDataProvider.cs # common/ASC.IPSecurity/Data/IPRestrictionsRepository.cs # common/ASC.Webhooks.Core/DbWorker.cs # products/ASC.Files/Core/Core/Dao/TeamlabDao/FolderDao.cs # products/ASC.Files/Core/ThirdPartyApp/BoxApp.cs # products/ASC.Files/Core/ThirdPartyApp/GoogleDriveApp.cs		2023-06-27 18:29:23 +03:00
..
DbAzService.cs	Merge branch 'develop' into feature/optimization-queries	2023-06-27 18:29:23 +03:00
DbLoginEventsManager.cs	Merge branch 'develop' into feature/optimization-queries	2023-06-27 18:29:23 +03:00
DbQuotaService.cs	Merge branch 'develop' into feature/optimization-queries	2023-06-27 18:29:23 +03:00
DbSettingsManager.cs	fix await using	2023-06-01 14:27:27 +03:00
DbSubscriptionService.cs	Merge branch 'develop' into feature/optimization-queries	2023-06-27 18:29:23 +03:00
DbTenantService.cs	Merge branch 'develop' into feature/optimization-queries	2023-06-27 18:29:23 +03:00
DbUserService.cs	Merge branch 'develop' into feature/optimization-queries	2023-06-27 18:29:23 +03:00