From: rinpatch <rinpatch@sdf.org>
Date: Fri, 29 May 2020 09:46:31 +0000 (+0000)
Subject: Merge branch 'fix/mediaproxy-bypass-emoji' into 'develop'
X-Git-Url: https://git.squeep.com/?a=commitdiff_plain;h=396bc69aeef951f163c0c20474ce4653df1dd667;p=akkoma

Merge branch 'fix/mediaproxy-bypass-emoji' into 'develop'

Fix profile emojis bypassing mediaproxy and harden CSP

Closes #1810

See merge request pleroma/pleroma!2596
---

396bc69aeef951f163c0c20474ce4653df1dd667