pavelbannov 9968873305 Merge branch 'master' into feature/fix_API_return ... # Conflicts: # web/ASC.Web.Api/Controllers/SettingsController.cs		2020-10-13 13:33:24 +03:00
..
Controllers	Merge branch 'master' into feature/fix_API_return	2020-10-13 13:33:24 +03:00
Models	Api: moved from release/11 4414f77b	2020-09-17 15:04:28 +03:00
Properties	Common nlog config	2019-11-15 11:47:56 +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	.net core up to 3.1	2019-12-06 12:12:51 +03:00
PeopleProduct.cs	fix	2020-08-27 17:01:37 +03:00
Program.cs	revert discard	2020-10-12 22:39:23 +03:00
Startup.cs	revert discard	2020-10-12 22:39:23 +03:00