MatrixSynapse/synapse/api
Mark Haines 2aeaa7b77c Merge branch 'develop' into storage_transactions
Conflicts:
	synapse/handlers/room.py
	synapse/storage/stream.py
2014-08-27 17:15:58 +01:00
..
events
__init__.py
auth.py add _get_room_member, fix datastore methods 2014-08-27 16:51:54 +01:00
constants.py
errors.py
urls.py