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)
commit396bc69aeef951f163c0c20474ce4653df1dd667
tree712ddf51f95eed60b6d8bdb1bc196dbb5a35e94f
parent1d30608e204b8c9a0afe817bbe1261b1a9af9240
parent27180611dfffd064e65793f90c67dc16fff8ecc2
Merge branch 'fix/mediaproxy-bypass-emoji' into 'develop'

Fix profile emojis bypassing mediaproxy and harden CSP

Closes #1810

See merge request pleroma/pleroma!2596