pavelbannov 3a747ef8e4 Merge branch 'master' into feature/system-json ... # Conflicts: # common/ASC.Api.Core/Core/ApiContext.cs # common/ASC.Api.Core/Core/ApiDateTime.cs # common/ASC.Api.Core/Model/EmployeeWraper.cs # common/ASC.Api.Core/Model/EmployeeWraperFull.cs # common/ASC.Core.Common/Caching/CachedUserService.cs # common/ASC.Core.Common/Context/Impl/UserManager.cs # products/ASC.People/Server/Models/GroupWrapperFull.cs # products/ASC.People/Server/Startup.cs # web/ASC.Web.Api/Models/BuildVersion.cs		2020-05-07 10:28:20 +03:00
..
Controllers	Merge branch 'master' into feature/system-json	2020-05-07 10:28:20 +03:00
Models	Merge branch 'master' into feature/system-json	2020-05-07 10:28:20 +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	Removed unused resources	2019-08-13 16:05:36 +03:00
Program.cs	Added DIHelper	2020-02-17 11:58:14 +03:00
Startup.cs	Merge branch 'master' into feature/system-json	2020-05-07 10:28:20 +03:00