summary refs log tree commit diff
path: root/synapse/rest/client/v1/base.py
diff options
context:
space:
mode:
authorMark Haines <mjark@negativecurvature.net>2016-04-22 16:26:57 +0100
committerMark Haines <mjark@negativecurvature.net>2016-04-22 16:26:57 +0100
commit62607d5452ec191039d326aefde6416eea34cb39 (patch)
treec66b0659ff408ad425c8270a8a428310248f911c /synapse/rest/client/v1/base.py
parentMove SynapseSite to its own file (diff)
parentMerge pull request #747 from matrix-org/markjh/http_resource_tree (diff)
downloadsynapse-62607d5452ec191039d326aefde6416eea34cb39.tar.xz
Merge branch 'develop' into markjh/split_out_site.py
Conflicts:
	synapse/app/homeserver.py
Diffstat (limited to 'synapse/rest/client/v1/base.py')
0 files changed, 0 insertions, 0 deletions