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)
media_proxy: CSP, content-disposition

See merge request pleroma/pleroma!448


Trivial merge