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 |
||
---|---|---|
.. | ||
ConfirmTypeEnum.cs | ||
Constants.cs | ||
DarkThemeSettings.cs | ||
DisplayUserNameFormat.cs | ||
DisplayUserSettings.cs | ||
PersonalQuotaSettings.cs | ||
UserExtensions.cs | ||
UserFormatter.cs | ||
UserQuotaSettings.cs |