diff options
author | Mark Haines <mark.haines@matrix.org> | 2015-10-21 15:48:34 +0100 |
---|---|---|
committer | Mark Haines <mark.haines@matrix.org> | 2015-10-21 15:48:34 +0100 |
commit | 5201c661082cb66e544c968ab3d5d97278509774 (patch) | |
tree | 1a23e19f9be1c6139fbff4052b416261d6aadcd6 /synapse/util/third_party_invites.py | |
parent | Doc string for the SyncHandler.typing_by_room method (diff) | |
parent | Merge pull request #316 from matrix-org/markjh/v2_sync_archived (diff) | |
download | synapse-5201c661082cb66e544c968ab3d5d97278509774.tar.xz |
Merge branch 'develop' into markjh/v2_sync_typing
Conflicts: synapse/handlers/sync.py
Diffstat (limited to 'synapse/util/third_party_invites.py')
-rw-r--r-- | synapse/util/third_party_invites.py | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/synapse/util/third_party_invites.py b/synapse/util/third_party_invites.py index 792db5ba39..31d186740d 100644 --- a/synapse/util/third_party_invites.py +++ b/synapse/util/third_party_invites.py @@ -23,8 +23,8 @@ JOIN_KEYS = { "token", "public_key", "key_validity_url", - "signatures", "sender", + "signed", } |