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
..
Attributes	enum generator	2022-07-05 16:58:11 +03:00
Core	async refactoring	2023-05-19 14:42:02 +03:00
Engine	Merge branch 'develop' into feature/optimization-queries	2023-06-27 18:29:23 +03:00
Log	add loggers	2022-05-20 18:24:41 +03:00
protos	refactoring *.proto files according to https://bit.ly/3KcZ0Ef	2022-01-11 19:28:48 +03:00
Service	Merge branch 'develop' into features/security-elasticsearch	2023-06-01 15:45:31 +03:00
ASC.ElasticSearch.csproj	update external dependency	2023-01-19 19:05:07 +03:00
GlobalUsings.cs	enum generator	2022-07-05 16:58:11 +03:00