From: lambda <pleromagit@rogerbraun.net>
Date: Tue, 13 Nov 2018 15:15:05 +0000 (+0000)
Subject: Merge branch 'media-proxy-safety' into 'develop'
X-Git-Url: https://git.squeep.com/?a=commitdiff_plain;h=a43195bdaa295f624315cba9daad42097de0cfe7;p=akkoma

Merge branch 'media-proxy-safety' into 'develop'

media_proxy: CSP, content-disposition

See merge request pleroma/pleroma!448
---

a43195bdaa295f624315cba9daad42097de0cfe7