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	Fix stream test. Make sure we add join to auth_events for invitiations	2014-12-12 10:42:27 +00:00
test_presence.py
test_profile.py
test_rooms.py	Merge branch 'develop' of github.com:matrix-org/synapse into events_refactor	2014-12-15 14:45:59 +00:00
test_typing.py	Send list of typing user IDs as 'user_ids' list within 'content', so that m.typing stream events have a toplevel content, for consistency with others	2014-12-12 11:59:46 +00:00
utils.py