diff options
| author | Erik Johnston <erik@matrix.org> | 2019-01-23 17:27:43 +0000 |
|---|---|---|
| committer | Erik Johnston <erik@matrix.org> | 2019-01-23 17:27:43 +0000 |
| commit | fd654a4d54e812857fff273609ac6d14ae5d28aa (patch) | |
| tree | 62b3d8217b482f0b62daee407ebc649b494b340d /synapse/handlers/federation.py | |
| parent | Update newsfile (diff) | |
| parent | Newsfile (diff) | |
| download | synapse-fd654a4d54e812857fff273609ac6d14ae5d28aa.tar.xz | |
Merge branch 'erikj/msc_1813' into erikj/require_format_version
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 a3bb864bb2..d1ba1450e9 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, |