Sergey Linnik d2e23e3ed4 Merge remote-tracking branch 'remotes/origin/master' into feature/api-descriptions ... # Conflicts: # common/ASC.Core.Common/Tenants/TenantQuota.cs # products/ASC.Files/Core/Core/Dao/Interfaces/IFileDao.cs # products/ASC.Files/Server/Api/FoldersController.cs # products/ASC.Files/Server/Api/OperationController.cs # products/ASC.Files/Server/Api/SettingsController.cs # web/ASC.Web.Api/Api/AuthenticationController.cs # web/ASC.Web.Api/Api/CapabilitiesController.cs # web/ASC.Web.Api/Api/PortalController.cs # web/ASC.Web.Api/Api/Settings/MessageSettingsController.cs # web/ASC.Web.Api/Api/SmtpSettingsController.cs # web/ASC.Web.Api/ApiModels/ResponseDto/SettingsDto.cs		2023-08-01 11:39:57 +03:00
..
Base	Merge remote-tracking branch 'remotes/origin/master' into feature/api-descriptions	2023-08-01 11:39:57 +03:00
ComplexOperations	socket notification when archiving a room,	2023-04-03 16:31:14 +05:00
Log	fix static, braces, log	2022-06-15 15:39:37 +03:00
Novell	Fix documentation warnings	2023-03-29 19:25:20 +05:00
Wrapper	async UpdateUserInfo and SaveUserInfo	2022-10-25 18:27:56 +03:00
ASC.ActiveDirectory.csproj	migrate from .net6 to .net7	2022-11-10 13:10:18 +03:00
GlobalUsings.cs	Merge branch 'develop' into feature/refactoring-saveUserInfo	2022-11-09 12:57:16 +03:00
LdapUserManager.cs	socket notification when archiving a room,	2023-04-03 16:31:14 +05:00
LdapUtils.cs	fix static, braces, log	2022-06-15 15:39:37 +03:00