summary refs log tree commit diff
path: root/synapse/rest/media
diff options
context:
space:
mode:
authorErik Johnston <erik@matrix.org>2019-10-10 14:30:51 +0100
committerErik Johnston <erik@matrix.org>2019-10-10 14:30:51 +0100
commit8bc529c04df64f610ae8d3911b671d363b52737c (patch)
tree9847e697839c844753ca0c884794bab527a0d36e /synapse/rest/media
parentMerge branch 'develop' of github.com:matrix-org/synapse into erikj/disable_sq... (diff)
parentMerge pull request #6191 from matrix-org/rav/fix_packaging (diff)
downloadsynapse-8bc529c04df64f610ae8d3911b671d363b52737c.tar.xz
Merge branch 'develop' of github.com:matrix-org/synapse into erikj/disable_sql_bytes
Diffstat (limited to 'synapse/rest/media')
0 files changed, 0 insertions, 0 deletions