Merge branch 'fix/csp-mediaproxy-base-url' into 'develop'
authorfeld <feld@feld.me>
Thu, 11 Jun 2020 16:18:06 +0000 (16:18 +0000)
committerfeld <feld@feld.me>
Thu, 11 Jun 2020 16:18:06 +0000 (16:18 +0000)
HTTP security plug: add media proxy base url host to csp

See merge request pleroma/pleroma!2638


Trivial merge