pavelbannov 789ab8f956 Merge branch 'develop' into feature/refactoring-saveUserInfo ... # Conflicts: # common/ASC.Core.Common/Context/Impl/UserManager.cs # products/ASC.Files/Core/GlobalUsings.cs # products/ASC.Files/Service/Core/FilesModule.cs # products/ASC.Files/Service/Core/FoldersModule.cs # products/ASC.People/Server/Api/UserController.cs # web/ASC.Web.Core/QuotaSync.cs # web/ASC.Web.Core/Users/UserManagerWrapper.cs		2022-11-09 12:57:16 +03:00
..
ASC.Files	Merge branch 'develop' into feature/refactoring-saveUserInfo	2022-11-09 12:57:16 +03:00
ASC.People/Server	Merge branch 'develop' into feature/refactoring-saveUserInfo	2022-11-09 12:57:16 +03:00