Erik Johnston 22dd0b37c4 Fix typo in merge conflict

2014-08-19 15:02:47 +01:00

..

__init__.py

add in copyrights to everything, not just the synapse subdir, and add a copyrighter.pl whilst we're at it

2014-08-13 03:32:18 +01:00

test_events.py

Rename MockHttpServer to MockHttpResource as it stands for one server resource rather than an entire server

2014-08-19 11:16:23 +01:00

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

Rename MockHttpServer to MockHttpResource as it stands for one server resource rather than an entire server

2014-08-19 11:16:23 +01:00