Merge branch 'fix/csp-for-captcha' into 'develop'
authorfeld <feld@feld.me>
Thu, 9 Jul 2020 14:33:24 +0000 (14:33 +0000)
committerfeld <feld@feld.me>
Thu, 9 Jul 2020 14:33:24 +0000 (14:33 +0000)
commit6b14f0c514d19fe7c9717dd9d3ada29e442ba706
tree7295ba98c7833534622a9c7fb27580691fbc06a5
parent8ca1f3e8c61b906387e9cb6fb8993d2ad496ab3d
parent49c4e2495357797caa82b4eb0a4d03e8c8dd2730
Merge branch 'fix/csp-for-captcha' into 'develop'

Add Captcha endpoint to CSP headers when MediaProxy is enabled.

See merge request pleroma/pleroma!2718