Mark Haines 9605593d11 Merge branch 'develop' into server2server_signing ...

Conflicts:
	synapse/storage/__init__.py
	tests/rest/test_presence.py

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

..

__init__.py

Reference Matrix Home Server

2014-08-12 15:10:52 +01:00

test_directory.py

Merge remote-tracking branch 'origin/develop' into test-sqlite-memory

2014-09-15 14:15:10 +01:00

test_federation.py

Merge branch 'develop' into server2server_signing

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

test_presence.py

SYN-75 Verify signatures on server to server transactions

2014-09-30 15:15:10 +01:00

test_presencelike.py

SYN-40: When a user updates their displayname or avatar update all their join events for all the rooms they are currently in.

2014-09-17 15:05:14 +01:00

test_profile.py

Merge branch 'test-sqlite-memory' of github.com:matrix-org/synapse into develop

2014-09-18 14:31:47 +01:00

test_room.py

Sign federation transactions

2014-09-24 17:25:41 +01:00

test_typing.py

SYN-75 Verify signatures on server to server transactions

2014-09-30 15:15:10 +01:00