summary refs log tree commit diff
path: root/synapse/rest/media
diff options
context:
space:
mode:
authorErik Johnston <erik@matrix.org>2017-01-23 16:15:10 +0000
committerErik Johnston <erik@matrix.org>2017-01-23 16:15:10 +0000
commitba8e144554781a8eae8dd140d6325503262dab7a (patch)
tree25899cab6178002a6112e39519e7baf076a5fc74 /synapse/rest/media
parentMerge pull request #1840 from matrix-org/erikj/current_state_fix (diff)
parentTypo (diff)
downloadsynapse-ba8e144554781a8eae8dd140d6325503262dab7a.tar.xz
Merge branch 'erikj/current_state_fix' into develop
Diffstat (limited to 'synapse/rest/media')
0 files changed, 0 insertions, 0 deletions