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
..
Contact.cs	added new license headers	2022-03-15 21:00:53 +03:00
EmployeeDto.cs	Files: removed .result	2022-08-12 16:26:57 +03:00
EmployeeFullDto.cs	Merge branch 'develop' into feature/refactoring-saveUserInfo	2022-11-02 11:16:29 +03:00
GroupSummaryDto.cs	code cleanup	2022-04-14 22:42:15 +03:00
TaskProgressDto.cs	Quota: quota recalculation check function	2022-10-25 17:31:25 +03:00