Merge remote-tracking branch 'origin/develop' into dbkr/password_reset_case_insensitive

This commit is contained in:
David Baker 2016-10-14 15:10:38 +01:00
commit bcb1245a2d
17 changed files with 691 additions and 477 deletions

View file

@ -320,6 +320,9 @@ class RoomStore(SQLBaseStore):
txn.execute(sql, (prev_id, current_id, limit,))
return txn.fetchall()
if prev_id == current_id:
return defer.succeed([])
return self.runInteraction(
"get_all_new_public_rooms", get_all_new_public_rooms
)