MatrixSynapse/tests/rest
Mark Haines 9605593d11 Merge branch 'develop' into server2server_signing
Conflicts:
	synapse/storage/__init__.py
	tests/rest/test_presence.py
2014-09-30 17:55:06 +01:00
..
__init__.py
test_events.py
test_presence.py Merge branch 'develop' into server2server_signing 2014-09-30 17:55:06 +01:00
test_profile.py
test_rooms.py
utils.py