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
..
delta	SYN-48: Implement WHOIS rest servlet	2014-09-29 14:59:52 +01:00
edge_pdus.sql	…
im.sql	Rename deletions to redactions	2014-09-24 15:27:59 +01:00
keys.sql	SYN-75 Verify signatures on server to server transactions	2014-09-30 15:15:10 +01:00
pdu.sql	…
presence.sql	…
profiles.sql	…
redactions.sql	Rename deletions to redactions	2014-09-24 15:27:59 +01:00
room_aliases.sql	…
transactions.sql	…
users.sql	SYN-48: Implement WHOIS rest servlet	2014-09-29 14:59:52 +01:00