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
..
Api	Merge branch 'develop' into feature/backend-refactor	2022-03-28 12:53:15 +03:00
ApiModels	added new license headers	2022-03-15 21:00:53 +03:00
Properties	backup.core: move backup.core	2021-09-02 15:41:54 +03:00
Services	added new license headers	2022-03-15 21:00:53 +03:00
appsettings.json	backup.core: move backup.core	2021-09-02 15:41:54 +03:00
ASC.Data.Backup.csproj	Autofact.Extensions.DependencyInjection package moved to ASC.Api.Core	2022-03-21 17:39:01 +03:00
GlobalUsings.cs	Merge 'feature/backend-refactor' into feature/builder-extensions	2022-03-22 15:57:46 +03:00
Program.cs	refactor	2022-03-23 19:23:25 +03:00
Startup.cs	Merge branch 'develop' into feature/backend-refactor	2022-03-28 12:53:15 +03:00