pavelbannov d8fb67f683 Merge branch 'master' into refactoring/di ... # 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		2019-09-27 13:45:37 +03:00
..
ConfirmTypeEnum.cs	Auth: added check confirm method	2019-09-26 16:36:53 +03:00
Constants.cs	DI: configuration	2019-09-24 13:32:12 +03:00
DisplayUserNameFormat.cs	init commit	2019-05-15 17:56:09 +03:00
DisplayUserSettings.cs	DI: configuration	2019-09-24 13:32:12 +03:00
PersonalQuotaSettings.cs	DI: BaseSettings	2019-09-13 14:18:27 +03:00
UserExtensions.cs	revert f85711b736	2019-09-12 14:34:58 +03:00
UserFormatter.cs	DI: configuration	2019-09-24 13:32:12 +03:00