pavelbannov 570ede7bba Merge branch 'develop' into feature/11.5.2 ... # Conflicts: # common/ASC.Data.Storage/StorageUploader.cs # common/services/ASC.Data.Backup/Service/BackupWorker.cs # products/ASC.Files/Core/Services/WCFService/FileOperations/FileOperationsManager.cs # web/ASC.Web.Api/Controllers/SettingsController.cs		2021-05-31 13:32:51 +03:00
..
DbAzService.cs	Scope: refactoring	2020-10-19 18:53:15 +03:00
DbQuotaService.cs	moved from 2e37dcd0	2020-12-28 16:22:08 +03:00
DbSettingsManager.cs	MemoryCache -> IMemoryCache	2021-01-12 20:51:14 +03:00
DbSubscriptionService.cs	moved from 2e37dcd0	2020-12-28 16:22:08 +03:00
DbTenantService.cs	Common, db: moved from 08a01422	2021-05-17 14:35:00 +03:00
DbUserService.cs	People: fixed query	2021-05-18 16:16:17 +03:00