Erik Johnston 22dd0b37c4 Fix typo in merge conflict		2014-08-19 15:02:47 +01:00
..
__init__.py	…
test_events.py	…
test_presence.py	Fix typo in merge conflict	2014-08-19 15:02:47 +01:00
test_profile.py	Merge branch 'master' of github.com:matrix-org/synapse into sql_refactor	2014-08-19 14:48:19 +01:00
test_rooms.py	Merge branch 'master' of github.com:matrix-org/synapse into sql_refactor	2014-08-19 14:48:19 +01:00
utils.py	…