pavelbannov 0000129b3b Merge branch 'master' into feature/release-11.0.0 ... # Conflicts: # common/ASC.Core.Common/Context/WorkContext.cs # common/ASC.Core.Common/Tenants/TenantControlPanelSettings.cs # common/ASC.Core.Common/Tenants/TenantQuota.cs # common/ASC.Data.Storage/DiscStorage/DiscDataStore.cs # common/ASC.Data.Storage/Encryption/Crypt.cs # common/ASC.Data.Storage/Encryption/CryptoStreamWrapper.cs # common/ASC.Data.Storage/Encryption/EncryptionFactory.cs # common/ASC.Data.Storage/Encryption/EncryptionServiceClient.cs # common/ASC.Data.Storage/Encryption/EncryptionSettings.cs # common/ASC.Data.Storage/Encryption/ICrypt.cs # common/ASC.Data.Storage/Encryption/IEncryptionService.cs # common/ASC.Data.Storage/Encryption/IMetadata.cs # common/ASC.Data.Storage/Encryption/IntegrityProtectionException.cs # common/ASC.Data.Storage/Encryption/Metadata.cs # common/ASC.Data.Storage/Encryption/StreamWrapper.cs # config/storage.json # web/ASC.Web.Api/Controllers/SettingsController.cs # web/ASC.Web.Core/PublicResources/webstudio_patterns.xml		2020-09-20 20:17:12 +03:00
..
DiscDataHandler.cs	Migration: registering dependencies in program	2020-08-20 16:53:39 +03:00
DiscDataStore.cs	Merge branch 'master' into feature/release-11.0.0	2020-09-20 20:17:12 +03:00
MappedPath.cs	private: firtst version	2020-08-12 12:58:08 +03:00