pavelbannov
0000129b3b
# 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 |
||
---|---|---|
.. | ||
Smtp | ||
AccountInfo.cs | ||
AuthModel.cs | ||
AuthServiceModel.cs | ||
BuildVersion.cs | ||
EncryptionSettingsModel.cs | ||
GreetingSettingsModel.cs | ||
IpRestrictionsModel.cs | ||
MailDomainSettingsModel.cs | ||
QuotaWrapper.cs | ||
SchemaModel.cs | ||
SecurityModel.cs | ||
SecurityWrapper.cs | ||
SettingsModel.cs | ||
SettingsWrapper.cs | ||
StatisticsWrapper.cs | ||
StorageEncryptionModel.cs | ||
StorageModel.cs | ||
StorageWrapper.cs | ||
TenantVersionWrapper.cs | ||
TfaModel.cs | ||
TimezonesModel.cs | ||
UploadLicenseModel.cs | ||
WebItemSecurityModel.cs | ||
WhiteLabelModel.cs | ||
WizardModel.cs |