pavelbannov 8ca88e4620 Merge branch 'develop' into feature/net6 ... # Conflicts: # common/ASC.Api.Core/Core/BaseStartup.cs # common/ASC.Common/ASC.Common.csproj # products/ASC.CRM/BackgroundTasks/ASC.CRM.BackgroundTasks.csproj # products/ASC.Files/Core/HttpHandlers/FileHandler.ashx.cs # products/ASC.Files/Server/ASC.Files.csproj # web/ASC.Web.HealthChecks.UI/ASC.Web.HealthChecks.UI.csproj		2021-11-23 16:40:50 +03:00
..
Controllers	Merge branch 'develop' into feature/net6	2021-11-23 16:40:50 +03:00
Models	Personal: added register method	2021-09-17 17:32:37 +03:00
Properties	refactoring launchSettings.json. added 'WSL 2 : Ubuntu 20.04' profile	2021-04-16 19:33:26 +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	Merge branch 'develop' into feature/net6	2021-11-23 16:40:50 +03:00
PeopleProduct.cs	Big Fix commit:	2021-03-22 00:34:21 +03:00
Program.cs	net6: warning CA1416	2021-10-13 11:07:03 +03:00
Startup.cs	Log: fix configuring	2021-07-13 21:17:18 +03:00