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
..
ApiControllerBase.cs
ContactsController.cs	Merge remote-tracking branch 'remotes/origin/feature/api-descriptions' into feature/api-develop	2023-08-01 17:07:05 +03:00
GroupController.cs	Merge remote-tracking branch 'remotes/origin/feature/api-descriptions' into feature/api-develop	2023-08-01 17:07:05 +03:00
NotificationController.cs	Merge remote-tracking branch 'remotes/origin/feature/api-descriptions' into feature/api-develop	2023-08-01 17:07:05 +03:00
PeopleControllerBase.cs	fix await using	2023-06-01 14:27:27 +03:00
PhotoController.cs	Merge remote-tracking branch 'remotes/origin/feature/api-descriptions' into feature/api-develop	2023-08-01 17:07:05 +03:00
ReassignController.cs	Merge remote-tracking branch 'remotes/origin/feature/api-descriptions' into feature/api-develop	2023-08-01 17:07:05 +03:00
RemoveUserDataController.cs	Merge remote-tracking branch 'remotes/origin/feature/api-descriptions' into feature/api-develop	2023-08-01 17:07:05 +03:00
ThirdpartyController.cs	Merge branch 'hotfix/v1.1.2' into develop	2023-08-28 18:53:10 +03:00
UserController.cs	Merge branch 'hotfix/v1.1.2' into develop	2023-09-04 23:01:50 +03:00