summary refs log tree commit diff
path: root/docs/admin_api
diff options
context:
space:
mode:
authorErik Johnston <erik@matrix.org>2024-05-07 11:48:08 +0100
committerErik Johnston <erik@matrix.org>2024-05-07 11:48:08 +0100
commitfa68816fb858081b880557af8baee03e9325e494 (patch)
tree7a24c8bc68ca45ec4ca84d51dbf6e1076476599d /docs/admin_api
parentMerge remote-tracking branch 'origin/release-v1.106' into matrix-org-hotfixes (diff)
parentBump serde from 1.0.199 to 1.0.200 (#17161) (diff)
downloadsynapse-fa68816fb858081b880557af8baee03e9325e494.tar.xz
Merge remote-tracking branch 'origin/develop' into matrix-org-hotfixes
Diffstat (limited to 'docs/admin_api')
-rw-r--r--docs/admin_api/room_membership.md2
1 files changed, 1 insertions, 1 deletions
diff --git a/docs/admin_api/room_membership.md b/docs/admin_api/room_membership.md

index 94bc95a8d5..6cbaba3dcc 100644 --- a/docs/admin_api/room_membership.md +++ b/docs/admin_api/room_membership.md
@@ -1,6 +1,6 @@ # Edit Room Membership API -This API allows an administrator to join an user account with a given `user_id` +This API allows an administrator to join a user account with a given `user_id` to a room with a given `room_id_or_alias`. You can only modify the membership of local users. The server administrator must be in the room and have permission to invite users.