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

This commit is contained in:
Erik Johnston 2016-06-03 14:04:07 +01:00
commit 579d0ef941

View file

@ -140,7 +140,7 @@ class TypingHandler(object):
def user_left_room(self, user, room_id):
user_id = user.to_string()
if self.is_mine_id(user_id):
member = RoomMember(room_id=room_id, user=user_id)
member = RoomMember(room_id=room_id, user_id=user_id)
yield self._stopped_typing(member)
@defer.inlineCallbacks