Mark Haines 984e207b59 Merge branch develop into server2server_signing ... Conflicts: synapse/app/homeserver.py		2014-10-13 10:58:50 +01:00
..
client-server	…
implementation-notes	…
server-server	…
sphinx	…
definitions.rst	…
human-id-rules.rst	…
specification-NOTHAVE.rst	…
specification.rst	…
state_resolution.rst	…
turn-howto.rst	…