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
..
Log	add loggers	2022-05-20 18:24:41 +03:00
ASC.Data.Reassigns.csproj	Csproj: ImplicitUsings	2022-03-05 11:20:05 +03:00
ASC.Data.Reassigns.sln	added ASC.Data.Reassign	2019-06-21 13:42:16 +03:00
GlobalUsings.cs	fix usings	2022-11-07 12:34:50 +03:00
ProgressStatus.cs	restore files	2022-10-28 10:48:46 +03:00
QueueWorker.cs	remove waste asc.data.reassings	2022-09-07 15:50:17 +03:00
ReassignProgressItem.cs	DoJob return task	2022-10-27 14:14:41 +03:00
RemoveProgressItem.cs	Merge branch 'develop' into feature/refactoring-saveUserInfo	2022-11-02 11:16:29 +03:00