summary refs log tree commit diff
path: root/synapse/rest
diff options
context:
space:
mode:
authorErik Johnston <erik@matrix.org>2016-09-08 15:33:00 +0100
committerErik Johnston <erik@matrix.org>2016-09-08 15:33:00 +0100
commitcaa22334b3645a02cc13d66204b604a84951dff6 (patch)
treeaa0bca82c80ef8fee8df69773dc9356238bf15fb /synapse/rest
parentMerge pull request #1083 from matrix-org/erikj/check_origin (diff)
parentMerge branch 'release-v0.17.2' of github.com:matrix-org/synapse (diff)
downloadsynapse-caa22334b3645a02cc13d66204b604a84951dff6.tar.xz
Merge branch 'master' of github.com:matrix-org/synapse into develop
Diffstat (limited to 'synapse/rest')
0 files changed, 0 insertions, 0 deletions