pavelbannov 475269ee84 Merge branch 'feature/backend-refactor' into feature/people-refactor ... # Conflicts: # products/ASC.Files/Core/Model/FileEntryWrapper.cs # products/ASC.Files/Core/Model/FileShareWrapper.cs # products/ASC.Files/Core/Model/FileWrapper.cs # products/ASC.Files/Core/Model/FolderWrapper.cs # products/ASC.People/Server/GlobalUsings.cs		2022-03-05 11:27:58 +03:00
..
Api	Merge branch 'feature/backend-refactor' into feature/people-refactor	2022-03-01 15:27:07 +03:00
ApiEngines	People: renamed	2022-03-02 21:24:45 +03:00
ApiModels	refactor	2022-02-28 23:25:25 +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 'feature/backend-refactor' into feature/people-refactor	2022-03-05 11:27:58 +03:00
GlobalUsings.cs	Merge branch 'feature/backend-refactor' into feature/people-refactor	2022-03-05 11:27:58 +03:00
PeopleProduct.cs	People: logic transferred to engines	2022-03-01 14:52:52 +03:00
Program.cs	refactor	2022-02-28 23:25:25 +03:00
Startup.cs	Merge branch 'feature/backend-refactor' into feature/people-refactor	2022-03-03 14:35:22 +03:00