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
..
schema	Merge branch 'develop' into server2server_signing	2014-09-30 17:55:06 +01:00
__init__.py	Merge branch 'develop' into server2server_signing	2014-09-30 17:55:06 +01:00
_base.py	…
directory.py	…
feedback.py	…
keys.py	SYN-75 Verify signatures on server to server transactions	2014-09-30 15:15:10 +01:00
pdu.py	…
presence.py	…
profile.py	…
registration.py	…
room.py	…
roommember.py	…
stream.py	…
transactions.py	…