diff options
| author | Hubert Chathi <hubert@uhoreg.ca> | 2019-09-04 16:56:29 -0700 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2019-09-04 16:56:29 -0700 |
| commit | 19bb5c80241782dbb257aabb40094c1aa8c22847 (patch) | |
| tree | 97fdf219de3ed852dfe3e35aebe98a4f1122a9ba /synapse/handlers/federation.py | |
| parent | Merge branch 'develop' into uhoreg/e2e_cross-signing_merged (diff) | |
| parent | add user signature stream change cache to slaved device store (diff) | |
| download | synapse-19bb5c80241782dbb257aabb40094c1aa8c22847.tar.xz | |
Merge pull request #5769 from matrix-org/uhoreg/e2e_cross-signing2-part1
Cross-signing [2/4] - upload/download 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 |