Mark Haines 984e207b59 Merge branch develop into server2server_signing ... Conflicts: synapse/app/homeserver.py		2014-10-13 10:58:50 +01:00
..
client-server	Clarify how-to some more.	2014-10-06 14:57:26 +01:00
implementation-notes	…
server-server	…
sphinx	…
definitions.rst	SPEC-3: First hack at defining some of the various event related concepts	2014-10-07 11:38:02 +01:00
human-id-rules.rst	…
specification-NOTHAVE.rst	…
specification.rst	Clarify that room alias domain names will be server-scoped; nonlocal edits are unliekly to work but nonlocal lookups will	2014-10-07 16:23:12 +01:00
state_resolution.rst	Add quick and dirty doc about state resolution	2014-10-06 17:34:44 +01:00
turn-howto.rst	…