diff options
| author | Erik Johnston <erik@matrix.org> | 2016-08-24 10:38:21 +0100 |
|---|---|---|
| committer | Erik Johnston <erik@matrix.org> | 2016-08-24 10:38:21 +0100 |
| commit | 86bcf4d6a7f40a60b1a3d8b607f8a670963c9fb2 (patch) | |
| tree | 50909a17ae7cc6b26f3b70d2286aa43d9418bbf9 /synapse/rest/client/v1/room.py | |
| parent | Add None checks to backfill (diff) | |
| parent | Merge pull request #1039 from matrix-org/kegan/join-with-custom-content (diff) | |
| download | synapse-86bcf4d6a7f40a60b1a3d8b607f8a670963c9fb2.tar.xz | |
Merge branch 'develop' of github.com:matrix-org/synapse into erikj/pagination
Diffstat (limited to 'synapse/rest/client/v1/room.py')
| -rw-r--r-- | synapse/rest/client/v1/room.py | 1 |
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), ) |