Erik Johnston 335e5d131c Merge branch 'test-sqlite-memory' of github.com:matrix-org/synapse into develop ... Conflicts: tests/handlers/test_profile.py		2014-09-18 14:31:47 +01:00
..
__init__.py	…
test_directory.py	…
test_federation.py	…
test_presence.py	Merge branch 'develop' into test-sqlite-memory	2014-09-17 18:27:47 +01:00
test_presencelike.py	…
test_profile.py	Merge branch 'test-sqlite-memory' of github.com:matrix-org/synapse into develop	2014-09-18 14:31:47 +01:00
test_room.py	…
test_typing.py	…