pavelbannov
d8fb67f683
# Conflicts: # common/ASC.Api.Core/Auth/ConfirmAuthHandler.cs # common/ASC.Core.Common/Context/SecurityContext.cs # common/ASC.Core.Common/Security/EmailValidationKeyProvider.cs # web/ASC.Web.Api/Controllers/AuthenticationController.cs # web/ASC.Web.Api/Controllers/PortalController.cs # web/ASC.Web.Core/Notify/StudioNotifyService.cs # web/ASC.Web.Core/Notify/StudioNotifyServiceSender.cs # web/ASC.Web.Core/Utility/CommonLinkUtility.cs |
||
---|---|---|
.. | ||
ConfirmTypeEnum.cs | ||
Constants.cs | ||
DisplayUserNameFormat.cs | ||
DisplayUserSettings.cs | ||
PersonalQuotaSettings.cs | ||
UserExtensions.cs | ||
UserFormatter.cs |