Merge branch 'develop' of github.com:matrix-org/synapse into neilj/fix_mau_init

This commit is contained in:
Neil Johnson 2018-10-24 16:25:39 +01:00
commit 07126e43a4
50 changed files with 1701 additions and 380 deletions

View file

@ -575,7 +575,7 @@ class RegistrationStore(RegistrationWorkerStore,
def _find_next_generated_user_id(txn):
txn.execute("SELECT name FROM users")
regex = re.compile("^@(\d+):")
regex = re.compile(r"^@(\d+):")
found = set()