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
..
AscCacheItem.proto	Kafka: added key to message	2019-08-28 14:14:09 +03:00
DistributedTaskCache.proto	Merge branch 'develop' into feature/remove-wq	2021-05-13 11:23:44 +03:00
DistributedTaskCancelation.proto	Replaced ICacheNotify with ICacheNotify<>	2019-07-22 15:31:09 +03:00
NotifyItem.proto	Notify: fix urls	2020-10-30 17:57:31 +03:00