synapse-product/synapse/api
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 add in whitespace after copyright statements to improve legibility 2014-08-13 03:14:34 +01:00
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 Added M_UNKNOWN_TOKEN error code and send it when there is an unrecognised access_token 2014-08-14 13:47:39 +01:00
notifier.py Removed member list servlet: now using generic state paths. 2014-08-26 09:26:07 +01:00
urls.py Added /matrix/content path, HS resource_for_content_repo attribute and FileUploadResource. Added stub methods. 2014-08-18 17:18:54 +01:00