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
test_events.py
test_presence.py
test_profile.py
test_rooms.py
test_typing.py
utils.py