summary refs log tree commit diff
path: root/synapse/handlers/federation.py
diff options
context:
space:
mode:
authorErik Johnston <erikj@jki.re>2017-01-20 15:14:05 +0000
committerGitHub <noreply@github.com>2017-01-20 15:14:05 +0000
commit3d9d48fffbf4f99607423533695ea1b8ae3b4edc (patch)
treec2ebee1c2495f6bdc3697184f747807746eebba4 /synapse/handlers/federation.py
parentMerge pull request #1837 from matrix-org/rav/fix_purge_media_doc (diff)
parentSpelling (diff)
downloadsynapse-3d9d48fffbf4f99607423533695ea1b8ae3b4edc.tar.xz
Merge pull request #1836 from matrix-org/erikj/current_state_fix
Derive current_state_events from state groups
Diffstat (limited to 'synapse/handlers/federation.py')
-rw-r--r--synapse/handlers/federation.py1
1 files changed, 0 insertions, 1 deletions
diff --git a/synapse/handlers/federation.py b/synapse/handlers/federation.py
index d3f5892376..996bfd0e23 100644
--- a/synapse/handlers/federation.py
+++ b/synapse/handlers/federation.py
@@ -1319,7 +1319,6 @@ class FederationHandler(BaseHandler):
 
         event_stream_id, max_stream_id = yield self.store.persist_event(
             event, new_event_context,
-            current_state=state,
         )
 
         defer.returnValue((event_stream_id, max_stream_id))