Merge branch 'fix/mediaproxy-bypass-emoji' into 'develop'
authorrinpatch <rinpatch@sdf.org>
Fri, 29 May 2020 09:46:31 +0000 (09:46 +0000)
committerrinpatch <rinpatch@sdf.org>
Fri, 29 May 2020 09:46:31 +0000 (09:46 +0000)
Fix profile emojis bypassing mediaproxy and harden CSP

Closes #1810

See merge request pleroma/pleroma!2596


Trivial merge