summary refs log tree commit diff
path: root/docs
diff options
context:
space:
mode:
authorErik Johnston <erik@matrix.org>2020-01-09 13:25:48 +0000
committerErik Johnston <erik@matrix.org>2020-01-09 13:25:48 +0000
commitd773290cb1d015f0debe5f64f4e495612cf1da60 (patch)
tree33a7294ddad2c3fbbcbbd7b4831b6813176515dd /docs
parentMerge pull request #6664 from matrix-org/erikj/media_admin_apis (diff)
parentFixup changelog (diff)
downloadsynapse-d773290cb1d015f0debe5f64f4e495612cf1da60.tar.xz
Merge branch 'master' into develop
Diffstat (limited to 'docs')
0 files changed, 0 insertions, 0 deletions