summary refs log tree commit diff
path: root/synapse/config/_base.py
diff options
context:
space:
mode:
authorErik Johnston <erikj@jki.re>2016-06-09 13:11:02 +0100
committerErik Johnston <erikj@jki.re>2016-06-09 13:11:02 +0100
commit5ee5b655b21242085f25851fe279cd3c039c1441 (patch)
treec7263da86ba251900aad0d9e5c5e2a7a47ee6a11 /synapse/config/_base.py
parentMerge pull request #860 from negzi/bug_fix_get_or_create_user (diff)
parent502 on /thumbnail when can't contact remote server (diff)
downloadsynapse-5ee5b655b21242085f25851fe279cd3c039c1441.tar.xz
Merge pull request #862 from matrix-org/erikj/media_remote_error
502 on /thumbnail when can't contact remote server
Diffstat (limited to 'synapse/config/_base.py')
0 files changed, 0 insertions, 0 deletions