pavelbannov
4dbf1e70b7
# Conflicts: # common/ASC.ActiveDirectory/GlobalUsings.cs # common/ASC.Data.Storage/StorageFactory.cs # common/ASC.Data.Storage/TenantQuotaController.cs # migrations/mysql/CoreDbContext/CoreDbContextModelSnapshot.cs # migrations/postgre/CoreDbContext/CoreDbContextModelSnapshot.cs # packages/client/src/pages/PortalSettings/categories/common/settingsBranding/whitelabel.js # products/ASC.People/Server/Api/UserController.cs # products/ASC.People/Server/GlobalUsings.cs # web/ASC.Web.Api/Api/Settings/SettingsController.cs # web/ASC.Web.Core/PublicResources/Resource.resx # web/ASC.Web.Core/Sms/StudioSmsNotificationSettings.cs |
||
---|---|---|
.. | ||
Tenant.cs | ||
TenantAuditSettings.cs | ||
TenantControlPanelSettings.cs | ||
TenantCookieSettings.cs | ||
TenantDomainValidator.cs | ||
TenantExceptions.cs | ||
TenantIndustry.cs | ||
TenantQuota.cs | ||
TenantQuotaException.cs | ||
TenantQuotaRow.cs | ||
TenantQuotaType.cs | ||
TenantRegistrationInfo.cs | ||
TenantStatus.cs | ||
TenantTrustedDomainsType.cs | ||
TenantUserQuotaSettings.cs | ||
TenantUtil.cs | ||
TenantVersion.cs |