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
..
ASC.ApiCache	Merge branch 'develop' into feature/optimization-queries	2023-06-27 18:29:23 +03:00
ASC.ApiSystem	Merge branch 'develop' into feature/delete-portal	2023-06-08 15:53:31 +03:00
ASC.AuditTrail	Merge branch 'develop' into feature/optimization-queries	2023-06-27 18:29:23 +03:00
ASC.ClearEvents	refactoring	2023-06-01 14:01:21 +03:00
ASC.Data.Backup	fix methods with task and without async	2023-03-28 13:13:13 +03:00
ASC.Data.Backup.BackgroundTasks	Merge branch 'develop' into feature/optimization-ef	2023-05-30 14:13:02 +03:00
ASC.Data.Storage.Encryption	add CustomSynchronizationContext	2023-03-27 15:04:50 +03:00
ASC.ElasticSearch	Merge branch 'develop' into feature/optimization-queries	2023-06-27 18:29:23 +03:00
ASC.Feed.Aggregator	Merge branch 'develop' into feature/delete-portal	2023-06-08 15:53:31 +03:00
ASC.Notify	Merge branch 'develop' into feature/optimization-queries	2023-06-27 18:29:23 +03:00
ASC.Studio.Notify	Fix/modified sendWhatsNew, Added RoomCreateUser, Added RoomRemoveUser	2023-03-03 20:02:48 +05:00
ASC.TelegramService	fix merge	2023-04-06 18:18:00 +03:00