summary refs log tree commit diff
path: root/synapse/handlers/room.py
diff options
context:
space:
mode:
authorErik Johnston <erik@matrix.org>2015-11-13 11:40:17 +0000
committerErik Johnston <erik@matrix.org>2015-11-13 11:40:17 +0000
commitda3dd4867dfb6414a4402089cbe3ef70fb605d23 (patch)
treea80ccd094d9dacafdbe02dc4a6705b0f3d217c2b /synapse/handlers/room.py
parentUpdate date (diff)
parentImplementation of state rollback in /sync (diff)
downloadsynapse-da3dd4867dfb6414a4402089cbe3ef70fb605d23.tar.xz
Merge branch 'develop' into release-v0.11.0
Diffstat (limited to 'synapse/handlers/room.py')
-rw-r--r--synapse/handlers/room.py3
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")