Erik Johnston 57e0e619f3 Merge branch 'develop' of github.com:matrix-org/synapse into events_refactor ... Conflicts: tests/handlers/test_room.py		2014-12-15 14:45:59 +00:00
..
__init__.py	Reference Matrix Home Server	2014-08-12 15:10:52 +01:00
test_directory.py	PEP8	2014-11-04 16:35:38 +00:00
test_federation.py	Fix federation test	2014-12-11 17:01:27 +00:00
test_presence.py	fix UTs by telling all the mock stores about the new methods for tracking retries	2014-12-09 23:53:07 +00:00
test_presencelike.py	Fix presencelike test	2014-11-05 11:13:01 +00:00
test_profile.py	Fix profile tests	2014-11-05 11:13:58 +00:00
test_room.py	Merge branch 'develop' of github.com:matrix-org/synapse into events_refactor	2014-12-15 14:45:59 +00:00
test_typing.py	Merge branch 'develop' of github.com:matrix-org/synapse into events_refactor	2014-12-15 14:45:59 +00:00