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	SYN-2: Allow server admins to delete room aliases	2014-09-30 11:31:42 +01:00
feedback.py	…
keys.py	SYN-75 Verify signatures on server to server transactions	2014-09-30 15:15:10 +01:00
pdu.py	Merge remote-tracking branch 'origin/develop' into test-sqlite-memory	2014-09-12 17:20:06 +01:00
presence.py	…
profile.py	…
registration.py	Update docstring	2014-09-29 15:35:54 +01:00
room.py	…
roommember.py	pyflakes cleanup	2014-09-30 12:38:38 +01:00
stream.py	…
transactions.py	…