pavelbannov 6867ded281 Merge branch 'develop' into feature/remove-wq ... # Conflicts: # common/ASC.Common/DIHelper.cs # common/ASC.Common/Threading/DistributedTaskQueue.cs # common/ASC.Common/Threading/Progress/ProgressQueue.cs # common/ASC.Common/Threading/Workers/WorkerQueue.cs # common/ASC.Data.Reassigns/QueueWorker.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 # common/services/ASC.Data.Backup/Startup.cs # common/services/ASC.Data.Storage.Encryption/EncryptionOperation.cs # common/services/ASC.Data.Storage.Encryption/EncryptionWorker.cs # products/ASC.Files/Core/Services/WCFService/FileOperations/FileOperationsManager.cs # products/ASC.Files/Core/Utils/FileMarker.cs # products/ASC.People/Server/Startup.cs # web/ASC.Web.Core/Users/UserPhotoManager.cs		2021-05-13 11:23:44 +03:00
..
ASC.Data.Reassigns.csproj	from Microsoft.NET.Sdk.Web to Microsoft.NET.Sdk for ClassLibrary Projects	2021-04-30 18:42:10 +03:00
ASC.Data.Reassigns.sln	added ASC.Data.Reassign	2019-06-21 13:42:16 +03:00
ProgressStatus.cs	added ASC.Data.Reassign	2019-06-21 13:42:16 +03:00
QueueWorker.cs	Merge branch 'develop' into feature/remove-wq	2021-05-13 11:23:44 +03:00
ReassignProgressItem.cs	Merge branch 'develop' into feature/remove-wq	2021-05-13 11:23:44 +03:00
RemoveProgressItem.cs	Merge branch 'develop' into feature/remove-wq	2021-05-13 11:23:44 +03:00