Merge branch 'develop' into rav/fix_attribute_mapping

1 files changed, 0 insertions, 1 deletions

diff --git a/synapse/storage/profile.py b/synapse/storage/profile.py

index 8a5d8e9b18..912c1df6be 100644
--- a/synapse/storage/profile.py
+++ b/synapse/storage/profile.py
@@ -35,7 +35,6 @@ class ProfileWorkerStore(SQLBaseStore):
             if e.code == 404:
                 # no match
                 return ProfileInfo(None, None)
-                return
             else:
                 raise