Andrey Savihin 675590854c Merge remote-tracking branch 'remotes/origin/develop' into feature/reassign-data ... # Conflicts: # products/ASC.Files/Core/Core/Thirdparty/ThirdPartyFolderDao.cs # products/ASC.People/Server/Api/UserController.cs		2023-09-12 15:18:27 +03:00
..
Api	Merge remote-tracking branch 'remotes/origin/develop' into feature/reassign-data	2023-09-12 15:18:27 +03:00
ApiModels	Merge branch 'develop' into feature/reassign-data	2023-09-06 13:00:15 +03:00
Log	Log: refactoring	2022-05-26 12:01:54 +03:00
Properties	Merge branch 'master' into develop	2023-07-18 19:26:32 +03:00
Resources	added pt-PT	2023-09-05 17:23:59 +03:00
.gitignore	Merge branch 'master' into develop	2023-07-18 19:26:32 +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	Hide documentation warnings	2023-04-05 20:41:04 +05:00
GlobalUsings.cs	Merge remote-tracking branch 'remotes/origin/develop' into feature/reassign-data	2023-07-13 09:49:30 +03:00
PeopleProduct.cs	IDE1006	2022-03-25 19:26:06 +03:00
Program.cs	fixed ArgumentOutOfRangeException	2023-08-04 17:42:14 +03:00
Startup.cs	ASC.People: Register services for reassign and remove user data	2023-07-08 10:14:48 +03:00