diff options
| author | Erik Johnston <erikj@jki.re> | 2019-01-25 10:27:25 +0000 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2019-01-25 10:27:25 +0000 |
| commit | 28c21cd578587a1890ebf739fde94b2375cb4429 (patch) | |
| tree | 69514e969311bdee344e51a524969c73c0fdb066 /synapse/handlers/federation.py | |
| parent | Merge pull request #4469 from matrix-org/revert-4451-erikj/require_format_ver... (diff) | |
| parent | Merge branch 'develop' of github.com:matrix-org/synapse into erikj/msc_1813 (diff) | |
| download | synapse-28c21cd578587a1890ebf739fde94b2375cb4429.tar.xz | |
Merge pull request #4447 from matrix-org/erikj/msc_1813
Implement MSC 1813 - Add room version to make APIs
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 453d393ce1..c52dca1b81 100644 --- a/synapse/handlers/federation.py +++ b/synapse/handlers/federation.py @@ -1336,7 +1336,7 @@ class FederationHandler(BaseHandler): @defer.inlineCallbacks def _make_and_verify_event(self, target_hosts, room_id, user_id, membership, content={}, params=None): - origin, pdu = yield self.federation_client.make_membership_event( + origin, pdu, _ = yield self.federation_client.make_membership_event( target_hosts, room_id, user_id, |