pavelbannov 0bbc383266 Merge branch 'master' into refactoring/di ... # Conflicts: # common/ASC.Api.Core/Auth/ConfirmAuthHandler.cs # common/ASC.Core.Common/Security/EmailValidationKeyProvider.cs # web/ASC.Web.Api/Controllers/PortalController.cs # web/ASC.Web.Api/Controllers/SettingsController.cs # web/ASC.Web.Core/Notify/StudioNotifyService.cs		2019-10-30 11:45:55 +03:00
..
ConfirmAuthHandler.cs	Merge branch 'master' into refactoring/di	2019-10-30 11:45:55 +03:00
CookieAuthHandler.cs	DI: configuration	2019-09-23 15:20:08 +03:00