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
..
Auth	UserDbContext - async	2023-03-24 10:53:49 +03:00
Convention	added new license headers	2022-03-15 21:00:53 +03:00
Core	Merge branch 'develop' into feature/optimization-ef	2023-05-30 14:13:02 +03:00
Extensions	Merge branch 'develop' into feature/optimization-ef	2023-05-17 11:01:32 +03:00
Log	refactoring	2022-08-09 19:13:07 +03:00
Middleware	Merge branch 'develop' into feature/optimization-ef	2023-05-30 14:13:02 +03:00
Model	Merge branch 'develop' into feature/optimization-ef	2023-05-17 11:01:32 +03:00
Routing	fixed Bug 62708	2023-05-23 15:02:01 +03:00
Security	Merge branch 'develop' into feature/optimization-queries	2023-06-27 18:29:23 +03:00
ASC.Api.Core.csproj	downgrade AspNetCore.HealthChecks.Elasticsearch	2023-03-07 15:30:08 +03:00
GlobalUsings.cs	asc.apicache	2022-12-16 15:41:09 +03:00