diff options
| author | Erik Johnston <erik@matrix.org> | 2019-09-05 17:27:46 +0100 |
|---|---|---|
| committer | Erik Johnston <erik@matrix.org> | 2019-09-05 17:27:46 +0100 |
| commit | 591d82f06b81738efe67c13cdeee0901c3b28946 (patch) | |
| tree | 018ec1d3caaa956d2173e9b11c74f78619aba0de /synapse/handlers/federation.py | |
| parent | Fix test (diff) | |
| parent | Merge pull request #5984 from matrix-org/joriks/opentracing_link_send_to_edu_... (diff) | |
| download | synapse-591d82f06b81738efe67c13cdeee0901c3b28946.tar.xz | |
Merge branch 'develop' of github.com:matrix-org/synapse into erikj/censor_redactions
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 |