Merge branch 'develop' into rav/fix_attribute_mapping

1 files changed, 0 insertions, 1 deletions

diff --git a/synapse/handlers/events.py b/synapse/handlers/events.py

index 2f1f10a9af..5e748687e3 100644
--- a/synapse/handlers/events.py
+++ b/synapse/handlers/events.py
@@ -167,7 +167,6 @@ class EventHandler(BaseHandler):
 
         if not event:
             return None
-            return
 
         users = yield self.store.get_users_in_room(event.room_id)
         is_peeking = user.to_string() not in users