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 fix the copyright holder from matrix.org to OpenMarket Ltd, as matrix.org hasn't been incorporated in time for launch. 2014-09-03 17:31:57 +01:00
test_events.py Have all unit tests import from our own subclass of trial's unittest TestCase; set up logging in ONE PLACE ONLY 2014-09-12 18:46:13 +01:00
test_presence.py Merge branch 'develop' into server2server_signing 2014-09-30 17:55:06 +01:00
test_profile.py Track the IP users connect with. Add an admin column to users table. 2014-09-26 16:36:24 +01:00
test_rooms.py Unbreak tests after changing storage API 2014-09-29 15:35:57 +01:00
utils.py Be consistent when associating keys with login types for registration/login. 2014-09-15 15:38:29 +01:00