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
..
Core	Merge branch 'develop' into feature/optimization-ef	2023-05-30 14:13:02 +03:00
Data	fix MessagesRepository	2023-04-10 14:02:57 +03:00
EF/Model	fix for merge	2022-07-11 12:29:45 +03:00
Log	moved from ddf515b8	2022-06-01 17:07:08 +03:00
ASC.MessagingSystem.csproj	migrate from .net6 to .net7	2022-11-10 13:10:18 +03:00
GlobalUsings.cs	Fix/modified sendWhatsNew, Added RoomCreateUser, Added RoomRemoveUser	2023-03-03 20:02:48 +05:00