Paul "LeoNerd" Evans 31a049eb69 Merge branch 'develop' into room-initial-sync ...

Conflicts:
	synapse/handlers/message.py

2014-11-17 16:59:24 +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 rest.test_events. Convert to use SQLiteMemoryDbPool

2014-11-10 15:37:53 +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' into room-initial-sync

2014-11-17 16:59:24 +00:00

utils.py

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

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