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
..
client	Merge remote-tracking branch 'remotes/origin/develop' into feature/reassign-data	2023-09-12 15:18:27 +03:00
common	Merge remote-tracking branch 'remotes/origin/develop' into feature/reassign-data	2023-09-12 15:18:27 +03:00
components	Merge remote-tracking branch 'remotes/origin/develop' into feature/reassign-data	2023-09-12 15:18:27 +03:00
editor	added translations	2023-09-07 18:40:17 +03:00
login	Merge branch 'develop' into feature/new-for-client	2023-09-08 18:51:06 +04:00
auto-changelog-2.3.1.tgz