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)
commit5474b5c988d3ab8869217b72d3702fb9396adadf
treee76e1d1bea5ee477d1d946fb8ac7534f8d9195ff
parent5d6ec6e5fc9b00d367568dd111816b90cddad02b
parent7f7a1a467677471e0e1ec688e4eca9ba759d976a
Merge branch 'fix/csp-mediaproxy-base-url' into 'develop'

HTTP security plug: add media proxy base url host to csp

See merge request pleroma/pleroma!2638