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
..
ASC.Files	Merge remote-tracking branch 'remotes/origin/develop' into feature/reassign-data	2023-09-12 15:18:27 +03:00
ASC.People/Server	Merge remote-tracking branch 'remotes/origin/develop' into feature/reassign-data	2023-09-12 15:18:27 +03:00