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
..
events	Merge branch 'develop' of github.com:matrix-org/synapse into client_server_url_rename	2014-08-26 10:04:26 +01:00
streams	Fix pyflakes errors	2014-08-26 16:02:59 +01:00
__init__.py	…
auth.py	Merge branch 'develop' into storage_transactions	2014-08-26 16:07:05 +01:00
constants.py	Removed member list servlet: now using generic state paths.	2014-08-26 09:26:07 +01:00
errors.py	…
notifier.py	Removed member list servlet: now using generic state paths.	2014-08-26 09:26:07 +01:00
urls.py	…