summary refs log tree commit diff
path: root/synapse/rest/client
diff options
context:
space:
mode:
authorKegsay <kegsay@gmail.com>2016-08-23 17:22:38 +0100
committerGitHub <noreply@github.com>2016-08-23 17:22:38 +0100
commit928b2187eab920e768a6076d186aaf97d44510b4 (patch)
tree015f70068aa38404943f6b7ae8b53195901c8f2e /synapse/rest/client
parentMerge pull request #1038 from matrix-org/erikj/receved_txn_purge (diff)
parentPass through user-supplied content in /join/$room_id (diff)
downloadsynapse-928b2187eab920e768a6076d186aaf97d44510b4.tar.xz
Merge pull request #1039 from matrix-org/kegan/join-with-custom-content
Pass through user-supplied content in /join/$room_id
Diffstat (limited to 'synapse/rest/client')
-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 89c3895118..0d81757010 100644
--- a/synapse/rest/client/v1/room.py
+++ b/synapse/rest/client/v1/room.py
@@ -268,6 +268,7 @@ class JoinRoomAliasServlet(ClientV1RestServlet):
             action="join",
             txn_id=txn_id,
             remote_room_hosts=remote_room_hosts,
+            content=content,
             third_party_signed=content.get("third_party_signed", None),
         )