pavelbannov e5229f12f5 Merge branch 'develop' into feature/backend-refactor ... # Conflicts: # common/ASC.Api.Core/Middleware/TenantStatusFilter.cs # common/ASC.Common/Threading/DistributedTaskQueue.cs # common/ASC.Data.Backup.Core/BackupAjaxHandler.cs # common/ASC.Data.Backup.Core/BackupFileUploadHandler.cs # common/ASC.Data.Backup.Core/Core/NotifyHelper.cs # common/ASC.Data.Backup.Core/EF/BackupsContext.cs # common/ASC.Data.Backup.Core/Service/BackupWorker.cs # common/ASC.Data.Backup.Core/Storage/ConsumerBackupStorage.cs # common/ASC.Data.Backup.Core/Tasks/Data/TableInfo.cs # common/ASC.Data.Storage/Configuration/StorageSettings.cs # common/ASC.Data.Storage/DiscStorage/DiscDataStore.cs # products/ASC.Files/Core/Core/ResponseStream.cs # products/ASC.Files/Core/Helpers/Global.cs # products/ASC.Files/Core/Utils/EntryManager.cs # products/ASC.Files/Service/Thumbnail/Builder.cs # products/ASC.Files/Service/Thumbnail/Worker.cs # web/ASC.Web.Api/Controllers/SettingsController.cs # web/ASC.Web.Api/Models/SettingsWrapper.cs		2022-03-28 12:53:15 +03:00
..
Client	Web: Files: deleted useless folders after merge.	2022-03-22 13:22:51 +03:00
Core	Merge branch 'develop' into feature/backend-refactor	2022-03-28 12:53:15 +03:00
Server	refactor	2022-03-23 19:23:25 +03:00
Service	Merge branch 'develop' into feature/backend-refactor	2022-03-28 12:53:15 +03:00
Tests	Test: fix packages	2022-03-24 17:00:02 +03:00