Merge branch 'develop' of github.com:matrix-org/synapse into erikj/group_fed_update_profile

1 files changed, 1 insertions, 1 deletions

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

index a0fc9a6867..3fa8019eb7 100644
--- a/synapse/storage/roommember.py
+++ b/synapse/storage/roommember.py
@@ -636,7 +636,7 @@ class RoomMemberStore(SQLBaseStore):
                 room_id = row["room_id"]
                 try:
                     content = json.loads(row["content"])
-                except:
+                except Exception:
                     continue
 
                 display_name = content.get("displayname", None)