pavelbannov 6c78438b75 Merge branch 'develop' into feature/optimization-ef ... # Conflicts: # common/ASC.Api.Core/Middleware/WebhooksGlobalFilterAttribute.cs # common/ASC.Core.Common/Context/Impl/TenantManager.cs # common/ASC.Core.Common/Context/Impl/UserManager.cs # common/ASC.Core.Common/Core/RegionHelper.cs # common/ASC.Core.Common/Data/DbQuotaService.cs # common/ASC.Core.Common/GeolocationHelper.cs # common/ASC.Data.Backup.Core/Core/NotifyHelper.cs # products/ASC.Files/Core/Core/FileStorageService.cs # products/ASC.Files/Core/Services/NotifyService/NotifyClient.cs # products/ASC.Files/Service/Thumbnail/Builder.cs # products/ASC.People/Server/Api/UserController.cs # web/ASC.Web.Api/Api/ConnectionsController.cs # web/ASC.Web.Api/Api/PortalController.cs # web/ASC.Web.Api/Api/Settings/RadicaleController.cs # web/ASC.Web.Api/Api/Settings/TfaappController.cs # web/ASC.Web.Api/Core/QuotaHelper.cs # web/ASC.Web.Core/Notify/NotifyConfiguration.cs # web/ASC.Web.Core/Notify/StudioNotifyService.cs # web/ASC.Web.Core/Notify/StudioNotifyServiceHelper.cs		2023-05-30 14:13:02 +03:00
..
Api	UserDbContext - async	2023-03-24 10:53:49 +03:00
ApiModels/ResponseDto	moved from ddf515b8	2022-06-05 18:44:37 +03:00
Core	fix merge	2023-04-06 18:18:00 +03:00
Properties	moved from ddf515b8	2022-06-05 18:44:37 +03:00
Resources	Merge branch 'master' into develop	2023-05-29 14:36:12 +03:00
ASC.Migration.csproj	merge from develop	2022-12-01 14:52:46 +03:00
GlobalUsings.cs	refactoring	2022-11-24 17:21:34 +03:00
Program.cs	refactoring	2022-11-24 17:21:34 +03:00
Startup.cs	Cors: fix	2022-11-21 12:44:28 +03:00