DocSpace-client/common/ASC.Data.Storage/Configuration
pavelbannov 43892a29c6 Merge branch 'feature/backend-refactor' into feature/asc-storage-refactor
# Conflicts:
#	common/ASC.Data.Storage/BaseStorage.cs
#	common/ASC.Data.Storage/ChunkedUploader/CommonChunkedUploadSession.cs
#	common/ASC.Data.Storage/Configuration/StorageSettings.cs
#	common/ASC.Data.Storage/Constants.cs
#	common/ASC.Data.Storage/CrossModuleTransferUtility.cs
#	common/ASC.Data.Storage/DiscStorage/DiscDataStore.cs
#	common/ASC.Data.Storage/Encryption/EncryptionOperation.cs
#	common/ASC.Data.Storage/Encryption/EncryptionServiceClient.cs
#	common/ASC.Data.Storage/Encryption/EncryptionWorker.cs
#	common/ASC.Data.Storage/Extensions.cs
#	common/ASC.Data.Storage/GoogleCloud/GoogleCloudStorage.cs
#	common/ASC.Data.Storage/Migration/MigrateServiceClient.cs
#	common/ASC.Data.Storage/PathUtils.cs
#	common/ASC.Data.Storage/ProgressStream.cs
#	common/ASC.Data.Storage/RackspaceCloud/RackspaceCloudStorage.cs
#	common/ASC.Data.Storage/S3/S3Storage.cs
#	common/ASC.Data.Storage/StaticUploader.cs
#	common/ASC.Data.Storage/StorageFactory.cs
#	common/ASC.Data.Storage/StorageHandler.cs
#	common/ASC.Data.Storage/StorageUploader.cs
#	common/ASC.Data.Storage/TenantPath.cs
#	common/ASC.Data.Storage/TenantQuotaController.cs
#	common/ASC.Data.Storage/WebPath.cs
#	common/ASC.Data.Storage/Wildcard.cs
2022-02-16 12:47:11 +03:00
..
ACL.cs Storage: used file-scoped namespaces 2022-02-10 14:24:16 +03:00
Appender.cs Storage: used file-scoped namespaces 2022-02-10 14:24:16 +03:00
StorageSettings.cs Merge branch 'feature/backend-refactor' into feature/asc-storage-refactor 2022-02-16 12:47:11 +03:00