summary refs log tree commit diff
diff options
context:
space:
mode:
authorErik Johnston <erik@matrix.org>2017-10-19 11:23:05 +0100
committerErik Johnston <erik@matrix.org>2017-10-19 11:23:05 +0100
commitd747db1357a29ab61d3558ac579d519c8714bf54 (patch)
treee2eccb2b6b6c5df8141f8447b0b009fdc6221e47
parentMerge branch 'develop' of github.com:matrix-org/synapse into matrix-org-hotfixes (diff)
parentFix typo (diff)
downloadsynapse-d747db1357a29ab61d3558ac579d519c8714bf54.tar.xz
Merge branch 'develop' of github.com:matrix-org/synapse into matrix-org-hotfixes
-rw-r--r--synapse/federation/transport/server.py2
1 files changed, 1 insertions, 1 deletions
diff --git a/synapse/federation/transport/server.py b/synapse/federation/transport/server.py
index 09b97138c3..f0778c65c5 100644
--- a/synapse/federation/transport/server.py
+++ b/synapse/federation/transport/server.py
@@ -836,7 +836,7 @@ class FederationGroupsRenewAttestaionServlet(BaseFederationServlet):
         # We don't need to check auth here as we check the attestation signatures
 
         new_content = yield self.handler.on_renew_attestation(
-            origin, content, group_id, user_id
+            group_id, user_id, content
         )
 
         defer.returnValue((200, new_content))