summary refs log tree commit diff
path: root/synapse/rest/media/v1/upload_resource.py
diff options
context:
space:
mode:
authorErik Johnston <erikj@jki.re>2017-01-10 14:06:05 +0000
committerGitHub <noreply@github.com>2017-01-10 14:06:05 +0000
commit657488113e26115fa134deb8ca554188f3aa3709 (patch)
treef34de028f69dc157b2b4648cd2b7f3301c86d746 /synapse/rest/media/v1/upload_resource.py
parentMerge pull request #1787 from matrix-org/erikj/linearize_member (diff)
parentComment (diff)
downloadsynapse-657488113e26115fa134deb8ca554188f3aa3709.tar.xz
Merge pull request #1789 from matrix-org/erikj/decouple_presence
Don't block messages sending on bumping presence
Diffstat (limited to 'synapse/rest/media/v1/upload_resource.py')
0 files changed, 0 insertions, 0 deletions