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

fix the copyright holder from matrix.org to OpenMarket Ltd, as matrix.org hasn't been incorporated in time for launch.

2014-09-03 17:31:57 +01:00

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

Merge branch 'develop' into server2server_signing

2014-09-30 17:55:06 +01:00

test_profile.py

Sign outgoing PDUs.

2014-10-16 00:09:48 +01:00

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

Be consistent when associating keys with login types for registration/login.

2014-09-15 15:38:29 +01:00