Mark Haines 4b63b06cad Merge branch 'develop' into storage_transactions ... Conflicts: synapse/api/auth.py synapse/handlers/room.py synapse/storage/__init__.py		2014-08-26 16:07:05 +01:00
..
schema	Add a unique constraint on the room hosts table	2014-08-24 11:29:29 +01:00
__init__.py	Merge branch 'develop' into storage_transactions	2014-08-26 16:07:05 +01:00
_base.py	Merge branch 'develop' into storage_transactions	2014-08-26 16:07:05 +01:00
directory.py	add in whitespace after copyright statements to improve legibility	2014-08-13 03:14:34 +01:00
feedback.py	Merge branch 'develop' into storage_transactions	2014-08-26 16:07:05 +01:00
pdu.py	Add a 'backfill room' button	2014-08-19 14:20:03 +01:00
presence.py	retcols is mandatory. i have no idea how this could ever have worked?	2014-08-16 01:46:35 +01:00
profile.py	add in whitespace after copyright statements to improve legibility	2014-08-13 03:14:34 +01:00
registration.py	Be more helpful when failing to register/login, stating why (communication error, user in user, wrong credentials, etc). Make the HS send M_USER_IN_USE.	2014-08-14 16:03:04 +01:00
room.py	Merge branch 'develop' into storage_transactions	2014-08-26 16:07:05 +01:00
roommember.py	Merge branch 'develop' into storage_transactions	2014-08-26 16:07:05 +01:00
stream.py	Merge branch 'develop' into storage_transactions	2014-08-26 16:07:05 +01:00
transactions.py	add in whitespace after copyright statements to improve legibility	2014-08-13 03:14:34 +01:00