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
..
Controllers	Merge branch 'master' into refactoring/di	2019-09-27 13:45:37 +03:00
Models	DI: configuration	2019-09-24 13:32:12 +03:00
Properties	Getting STORAGE_ROOT from env variable	2019-09-09 18:04:28 +03:00
Resources	Removed unused resources	2019-08-13 16:05:36 +03:00
.gitignore	ASC.People project is divided into two separate parts: Server and Client	2019-07-10 11:21:12 +03:00
appsettings.json	ASC.People project is divided into two separate parts: Server and Client	2019-07-10 11:21:12 +03:00
ASC.People.csproj	suppress warning: NU1701 for release configuration	2019-09-10 18:20:17 +03:00
nlog.config	ASC.People project is divided into two separate parts: Server and Client	2019-07-10 11:21:12 +03:00
PeopleProduct.cs	Removed unused resources	2019-08-13 16:05:36 +03:00
Program.cs	kafka disabled by default	2019-08-23 15:49:23 +03:00
Startup.cs	DI: configuration	2019-09-24 13:32:12 +03:00