Merge branch 'develop' into anoa/v2_is

1 files changed, 1 insertions, 1 deletions

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

index 4605cb9c0b..fd9f94bbd5 100644
--- a/synapse/handlers/room_member.py
+++ b/synapse/handlers/room_member.py
@@ -1018,7 +1018,7 @@ class RoomMemberHandler(object):
         if not public_keys:
             public_keys.append(fallback_public_key)
         display_name = data["display_name"]
-        return (token, public_keys, fallback_public_key, display_name)
+        return token, public_keys, fallback_public_key, display_name
 
     @defer.inlineCallbacks
     def _is_host_in_room(self, current_state_ids):