Andrey Savihin
675590854c
# Conflicts: # products/ASC.Files/Core/Core/Thirdparty/ThirdPartyFolderDao.cs # products/ASC.People/Server/Api/UserController.cs |
||
---|---|---|
.. | ||
Core | ||
Server | ||
Service | ||
Tests |
Andrey Savihin
675590854c
# Conflicts: # products/ASC.Files/Core/Core/Thirdparty/ThirdPartyFolderDao.cs # products/ASC.People/Server/Api/UserController.cs |
||
---|---|---|
.. | ||
Core | ||
Server | ||
Service | ||
Tests |