Merge branch 'release-v0.12.0' into develop

This commit is contained in:
Mark Haines 2015-12-12 14:21:49 +00:00
commit deeebbfcb7
6 changed files with 47 additions and 12 deletions

View file

@ -755,7 +755,7 @@ class RoomMemberHandler(BaseHandler):
defer.returnValue((token, public_key, key_validity_url, display_name))
def forget(self, user, room_id):
self.store.forget(user.to_string(), room_id)
return self.store.forget(user.to_string(), room_id)
class RoomListHandler(BaseHandler):