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 |
||
---|---|---|
.. | ||
AuditEventDto.cs | ||
AuthenticationTokenDto.cs | ||
CapabilitiesDto.cs | ||
CurrenciesDto.cs | ||
CustomColorThemesSettingsDto.cs | ||
FeedDto.cs | ||
FirebaseDto.cs | ||
LdapCronSettingsDto.cs | ||
LdapSettingsDto.cs | ||
LdapStatusDto.cs | ||
LoginEventDto.cs | ||
LoginSettingsDto.cs | ||
PluginsDto.cs | ||
QuotaDto.cs | ||
QuotaUsageDto.cs | ||
SecurityDto.cs | ||
SettingsDto.cs | ||
SmtpSettingsDto.cs | ||
StorageDto.cs | ||
TenantVersionDto.cs | ||
UsageSpaceStatItemDto.cs | ||
WebhooksConfigDto.cs | ||
WebhooksLogDto.cs |