diff options
| author | Hubert Chathi <hubert@uhoreg.ca> | 2019-09-04 19:12:29 -0400 |
|---|---|---|
| committer | Hubert Chathi <hubert@uhoreg.ca> | 2019-09-04 19:12:29 -0400 |
| commit | faf72a4c403000f7815d171feb8bf1a83b353584 (patch) | |
| tree | d150b317ef4d0cf2245b664a37e51d76c0870352 /synapse/handlers/federation.py | |
| parent | Merge branch 'uhoreg/e2e_cross-signing_merged' into cross-signing_keys (diff) | |
| parent | Remove bind_email and bind_msisdn (#5964) (diff) | |
| download | synapse-faf72a4c403000f7815d171feb8bf1a83b353584.tar.xz | |
Merge branch 'develop' into cross-signing_keys
Diffstat (limited to 'synapse/handlers/federation.py')
| -rw-r--r-- | synapse/handlers/federation.py | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/synapse/handlers/federation.py b/synapse/handlers/federation.py index 94306c94a9..538b16efd6 100644 --- a/synapse/handlers/federation.py +++ b/synapse/handlers/federation.py @@ -1428,7 +1428,7 @@ class FederationHandler(BaseHandler): assert event.user_id == user_id assert event.state_key == user_id assert event.room_id == room_id - return (origin, event, format_ver) + return origin, event, format_ver @defer.inlineCallbacks @log_function |