summary refs log tree commit diff
path: root/demo
diff options
context:
space:
mode:
authorErik Johnston <erik@matrix.org>2014-09-03 11:59:57 +0100
committerErik Johnston <erik@matrix.org>2014-09-03 12:01:14 +0100
commitb50ea730b15706d0e2099f94cf8b3cf24b5c5433 (patch)
tree05fb4bb1190f0f2223de49bf17060481a8bfad70 /demo
parentAdd option to change content repo location (diff)
parentEdited /presence REST servlet to raise SynapseErrors to return a standard err... (diff)
downloadsynapse-b50ea730b15706d0e2099f94cf8b3cf24b5c5433.tar.xz
Merge branch 'develop' of github.com:matrix-org/synapse into develop
Conflicts:
	synapse/http/server.py
        synapse/http/content_repository.py
Diffstat (limited to 'demo')
0 files changed, 0 insertions, 0 deletions