pavelbannov e4d4db6563 Merge branch 'master' into feature/remove-wq ... # Conflicts: # common/ASC.Common/Threading/DistributedTaskQueue.cs # common/ASC.Common/Threading/Progress/ProgressBase.cs # common/ASC.Common/Threading/Progress/ProgressQueue.cs # common/ASC.Common/Threading/Workers/WorkerQueue.cs # common/ASC.Data.Reassigns/ReassignProgressItem.cs # common/ASC.Data.Reassigns/RemoveProgressItem.cs # common/ASC.Data.Storage/StaticUploader.cs # common/ASC.Data.Storage/StorageUploader.cs # common/services/ASC.Data.Backup/BackupServiceLauncher.cs # common/services/ASC.Data.Backup/Service/BackupService.cs # common/services/ASC.Data.Backup/Service/BackupWorker.cs # products/ASC.Files/Core/Services/WCFService/FileOperations/FileOperationsManager.cs # web/ASC.Web.Core/Users/UserPhotoManager.cs		2020-09-29 19:46:40 +03:00
..
Progress	removed WorkerQueue, ProgressQueue	2020-09-29 16:02:47 +03:00
DistributedTask.cs	removed WorkerQueue, ProgressQueue	2020-09-29 16:02:47 +03:00
DistributedTaskQueue.cs	Merge branch 'master' into feature/remove-wq	2020-09-29 19:46:40 +03:00
DistributedTaskStatus.cs	init commit	2019-05-15 17:56:09 +03:00