summary refs log tree commit diff
path: root/synapse/rest/client/v1/room.py
diff options
context:
space:
mode:
authorRichard van der Hoff <richard@matrix.org>2019-09-18 13:55:25 +0100
committerRichard van der Hoff <richard@matrix.org>2019-09-18 13:55:25 +0100
commit7b61e6f5d63d3723b368ad5f126bf89ff460c8c3 (patch)
tree82ec1b50431786edfaf12f6bc22814455b3d9a5e /synapse/rest/client/v1/room.py
parentRevert "Fix m.federate bug" (diff)
parentfix sample config (diff)
downloadsynapse-7b61e6f5d63d3723b368ad5f126bf89ff460c8c3.tar.xz
Merge branch 'develop' into matrix-org-hotfixes
Diffstat (limited to 'synapse/rest/client/v1/room.py')
-rw-r--r--synapse/rest/client/v1/room.py1
1 files changed, 1 insertions, 0 deletions
diff --git a/synapse/rest/client/v1/room.py b/synapse/rest/client/v1/room.py

index 3582259026..a6a7b3b57e 100644 --- a/synapse/rest/client/v1/room.py +++ b/synapse/rest/client/v1/room.py
@@ -701,6 +701,7 @@ class RoomMembershipRestServlet(TransactionRestServlet): content["id_server"], requester, txn_id, + content.get("id_access_token"), ) return 200, {}