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
..
ASC.Web.Api	Settings: added password settings	2020-09-29 18:08:54 +03:00
ASC.Web.Client	fix translate	2020-08-12 17:17:14 +03:00
ASC.Web.Common	deleted console.log, simple condition	2020-08-12 16:38:34 +03:00
ASC.Web.Components	web: components: bump version	2020-08-12 14:57:24 +03:00
ASC.Web.Core	Merge branch 'master' into feature/remove-wq	2020-09-29 19:46:40 +03:00
ASC.Web.Studio	Nuget: replaced thirdparty	2020-08-20 17:50:08 +03:00