summary refs log tree commit diff
path: root/synapse/state/__init__.py
diff options
context:
space:
mode:
authorHubert Chathi <hubert@uhoreg.ca>2019-09-04 19:12:29 -0400
committerHubert Chathi <hubert@uhoreg.ca>2019-09-04 19:12:29 -0400
commitfaf72a4c403000f7815d171feb8bf1a83b353584 (patch)
treed150b317ef4d0cf2245b664a37e51d76c0870352 /synapse/state/__init__.py
parentMerge branch 'uhoreg/e2e_cross-signing_merged' into cross-signing_keys (diff)
parentRemove bind_email and bind_msisdn (#5964) (diff)
downloadsynapse-faf72a4c403000f7815d171feb8bf1a83b353584.tar.xz
Merge branch 'develop' into cross-signing_keys
Diffstat (limited to 'synapse/state/__init__.py')
-rw-r--r--synapse/state/__init__.py1
1 files changed, 0 insertions, 1 deletions
diff --git a/synapse/state/__init__.py b/synapse/state/__init__.py
index a0d34f16ea..2b0f4c79ee 100644
--- a/synapse/state/__init__.py
+++ b/synapse/state/__init__.py
@@ -136,7 +136,6 @@ class StateHandler(object):
             if event_id:
                 event = yield self.store.get_event(event_id, allow_none=True)
             return event
-            return
 
         state_map = yield self.store.get_events(
             list(state.values()), get_prev_content=False