summary refs log tree commit diff
path: root/synapse/rest/media/__init__.py
diff options
context:
space:
mode:
authorErik Johnston <erik@matrix.org>2018-03-19 11:40:32 +0000
committerErik Johnston <erik@matrix.org>2018-03-19 11:41:01 +0000
commitfa728034900ae63d8132962008319d37df3993db (patch)
tree9ed8d7230c116bc28057f11395a795d3f993880c /synapse/rest/media/__init__.py
parentspell out not to massively increase bcrypt rounds (diff)
parentMerge branch 'hotfixes-v0.26.1' of github.com:matrix-org/synapse (diff)
downloadsynapse-fa728034900ae63d8132962008319d37df3993db.tar.xz
Merge branch 'master' of github.com:matrix-org/synapse into develop
Diffstat (limited to 'synapse/rest/media/__init__.py')
0 files changed, 0 insertions, 0 deletions