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

8.0 KiB

Raw Blame History

View Raw