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
..
Controllers	add async and AddBaseDbContext with settings	2022-12-20 10:27:55 +03:00
Helpers	Merge branch 'develop' into feature/optimization-queries	2023-06-27 18:29:23 +03:00
Models	refactoring	2022-12-16 15:56:03 +03:00
Properties	add bat for asc.apicache	2022-12-20 13:04:21 +03:00
appsettings.json	asc.apicache	2022-12-16 15:41:09 +03:00
ASC.ApiCache.csproj	fix	2023-02-07 19:12:09 +03:00
ConfigurationManagerExtension.cs	refactoring	2022-12-22 18:48:05 +03:00
GlobalUsings.cs	refactoring	2022-12-16 15:56:03 +03:00
Program.cs	refactoring	2022-12-22 18:48:05 +03:00
Startup.cs	refactoring	2023-02-27 18:38:01 +03:00