pavelbannov
6867ded281
# 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 |
||
---|---|---|
.. | ||
AscCacheItem.proto | ||
DistributedTaskCache.proto | ||
DistributedTaskCancelation.proto | ||
NotifyItem.proto |