summary refs log tree commit diff
path: root/synapse/rest
diff options
context:
space:
mode:
authorMatthew Hodgson <matthew@matrix.org>2017-01-07 04:00:42 +0000
committerMatthew Hodgson <matthew@matrix.org>2017-01-07 04:00:42 +0000
commit2f4b2f4783c608e27dba91e528d2c5a9032b0051 (patch)
treeead50f761654ce02404fed1f1c33afaebd6772f0 /synapse/rest
parentMerge branch 'release-v0.18.7' into develop (diff)
downloadsynapse-2f4b2f4783c608e27dba91e528d2c5a9032b0051.tar.xz
gah, fix mangled merge of 0.18.7 into develop
Diffstat (limited to 'synapse/rest')
0 files changed, 0 insertions, 0 deletions