Sergey Linnik 4af951856f Merge remote-tracking branch 'remotes/origin/release/v1.0.0' into feature/api-descriptions ... # Conflicts: # products/ASC.People/Server/Api/PhotoController.cs # products/ASC.People/Server/Api/UserController.cs # products/ASC.People/Server/ApiModels/RequestDto/LinkAccountRequestDto.cs # web/ASC.Web.Api/Api/AuthenticationController.cs # web/ASC.Web.Api/Api/Settings/SettingsController.cs		2023-04-18 18:08:59 +05:00
..
Base	Merge remote-tracking branch 'remotes/origin/release/v1.0.0' into feature/api-descriptions	2023-04-18 18:08:59 +05: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