Merge branch 'develop' into release-v0.11.0

1 files changed, 2 insertions, 1 deletions

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

index 0266926fc7..3f04752581 100644
--- a/synapse/handlers/room.py
+++ b/synapse/handlers/room.py
@@ -504,7 +504,8 @@ class RoomMemberHandler(BaseHandler):
             yield handler.do_invite_join(
                 room_hosts,
                 room_id,
-                event.user_id
+                event.user_id,
+                event.content,
             )
         else:
             logger.debug("Doing normal join")