Erik Johnston 347242a5c4 Merge branch 'master' of github.com:matrix-org/synapse into sql_refactor ... Conflicts: tests/rest/test_presence.py tests/rest/test_rooms.py tests/utils.py		2014-08-19 14:48:19 +01:00
..
__init__.py	Reference Matrix Home Server	2014-08-12 15:10:52 +01:00
test_directory.py	Removed http_server from HomeServer. Updated unit tests to use either resource_for_federation or resource_for_client depending on what is being tested.	2014-08-14 10:18:54 +01:00
test_federation.py	Removed http_server from HomeServer. Updated unit tests to use either resource_for_federation or resource_for_client depending on what is being tested.	2014-08-14 10:18:54 +01:00
test_presence.py	Rewrite of PresenceHandler test to ensure it covers the interaction with Federation as well	2014-08-19 14:26:06 +01:00
test_presencelike.py	Removed http_server from HomeServer. Updated unit tests to use either resource_for_federation or resource_for_client depending on what is being tested.	2014-08-14 10:18:54 +01:00
test_profile.py	Removed http_server from HomeServer. Updated unit tests to use either resource_for_federation or resource_for_client depending on what is being tested.	2014-08-14 10:18:54 +01:00
test_room.py	Fix some of the tests to reflect changes in the storage layer.	2014-08-15 17:42:21 +01:00