summary refs log tree commit diff
path: root/synapse/handlers/room.py
diff options
context:
space:
mode:
authorAndrew Morgan <andrew@amorgan.xyz>2019-09-03 20:46:42 +0100
committerAndrew Morgan <andrew@amorgan.xyz>2019-09-03 20:46:42 +0100
commitd9d156b5cdfe340a9b9c53b4002e5a14c5e9d68b (patch)
treef44b103aabcb58979d5155731f7e05036c7333e0 /synapse/handlers/room.py
parentMerge branch 'anoa/v2_lookup' of github.com:matrix-org/synapse into anoa/v2_l... (diff)
parentFix docstring (diff)
downloadsynapse-d9d156b5cdfe340a9b9c53b4002e5a14c5e9d68b.tar.xz
Merge branch 'develop' into anoa/v2_lookup
Diffstat (limited to 'synapse/handlers/room.py')
-rw-r--r--synapse/handlers/room.py1
1 files changed, 0 insertions, 1 deletions
diff --git a/synapse/handlers/room.py b/synapse/handlers/room.py
index 6e47fe7867..a509e11d69 100644
--- a/synapse/handlers/room.py
+++ b/synapse/handlers/room.py
@@ -852,7 +852,6 @@ class RoomContextHandler(object):
         )
         if not event:
             return None
-            return
 
         filtered = yield (filter_evts([event]))
         if not filtered: