Merge branch 'media-proxy-safety' into 'develop'
authorlambda <pleromagit@rogerbraun.net>
Tue, 13 Nov 2018 15:15:05 +0000 (15:15 +0000)
committerlambda <pleromagit@rogerbraun.net>
Tue, 13 Nov 2018 15:15:05 +0000 (15:15 +0000)
commita43195bdaa295f624315cba9daad42097de0cfe7
treec22a5d599bb619ce640ac5b790d46eac2d95982d
parent22d20c497b813cdaedddb40a46df2f597311b235
parent9b553a1087a3539280a4a085bcf7a79f29972f0a
Merge branch 'media-proxy-safety' into 'develop'

media_proxy: CSP, content-disposition

See merge request pleroma/pleroma!448