pavelbannov d864448da5 Merge branch 'hotfix/v1.1.2' into develop ... # Conflicts: # products/ASC.Files/Core/Core/VirtualRooms/InvitationLinkService.cs # products/ASC.Files/Core/Utils/FileSharing.cs # products/ASC.People/Server/Api/UserController.cs # web/ASC.Web.Api/Api/PortalController.cs		2023-09-04 23:01:50 +03:00
..
ASC.Files	Merge branch 'hotfix/v1.1.2' into develop	2023-09-04 23:01:50 +03:00
ASC.People/Server	Merge branch 'hotfix/v1.1.2' into develop	2023-09-04 23:01:50 +03:00