From: kaniini <nenolod@gmail.com>
Date: Sun, 2 Sep 2018 00:08:56 +0000 (+0000)
Subject: Merge branch 'security/emoji-xss' into 'develop'
X-Git-Url: http://git.squeep.com/?a=commitdiff_plain;h=3370fab1d0af1eb65c6d7f8422129b33ca4c654b;p=akkoma

Merge branch 'security/emoji-xss' into 'develop'

formatter: don't add XSS emoji

See merge request pleroma/pleroma!322
---

3370fab1d0af1eb65c6d7f8422129b33ca4c654b