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

..

client-server

Update API docs to include notes on /rooms/$roomid/state

2014-09-23 15:39:04 +01:00

implementation-notes

Shuffle files around in /docs

2014-08-28 09:45:05 +01:00

server-server

fix grammatics

2014-09-22 21:45:50 +01:00

sphinx

Reference Matrix Home Server

2014-08-12 15:10:52 +01:00

human-id-rules.rst

More rst formatting.

2014-09-09 15:13:50 -07:00

specification.rst

Re-wrap content after latest additions

2014-09-29 18:40:15 +01:00

turn-howto.rst

Just use a yaml list for turn servers

2014-09-25 19:18:32 +02:00