summary refs log tree commit diff
path: root/synapse/rest/media
diff options
context:
space:
mode:
authorErik Johnston <erik@matrix.org>2016-02-09 12:58:10 +0000
committerErik Johnston <erik@matrix.org>2016-02-09 12:58:10 +0000
commit9ac9b75bc4881ac181f10dd8a2cdf78fe2a47e99 (patch)
treea8f2adda8be5be4bd40d48dc8a0cbd93a7e66f78 /synapse/rest/media
parentMeasure some /sync related things (diff)
parentRevert "Reject additional path segments" (diff)
downloadsynapse-9ac9b75bc4881ac181f10dd8a2cdf78fe2a47e99.tar.xz
Merge branch 'develop' of github.com:matrix-org/synapse into develop
Diffstat (limited to 'synapse/rest/media')
0 files changed, 0 insertions, 0 deletions