Merge branch 'bugfix/csp-unproxied' into 'develop'
authorrinpatch <rinpatch@sdf.org>
Fri, 29 May 2020 21:23:49 +0000 (21:23 +0000)
committerrinpatch <rinpatch@sdf.org>
Fri, 29 May 2020 21:23:49 +0000 (21:23 +0000)
commitd23b3701d8f1341f3e4565d35ffa0c25b83af51d
tree171d34c7057c347b7a99c095cae013cd6d8d45e4
parent32ba2b7f9f5a285e76160f0a1317fcaaae49e27e
parent109af93227f65d308641e345c68c3884addb0181
Merge branch 'bugfix/csp-unproxied' into 'develop'

http_security_plug.ex: Fix non-proxied media

See merge request pleroma/pleroma!2610
lib/pleroma/plugs/http_security_plug.ex