Merge branch 'security/emoji-xss' into 'develop'
authorkaniini <nenolod@gmail.com>
Sun, 2 Sep 2018 00:08:56 +0000 (00:08 +0000)
committerkaniini <nenolod@gmail.com>
Sun, 2 Sep 2018 00:08:56 +0000 (00:08 +0000)
commit3370fab1d0af1eb65c6d7f8422129b33ca4c654b
tree041c906375fdf1edfc956b9ab3a0a6070575d906
parent3c7280934e3bdca8d5a870dc932406ccd9915d64
parent834515fb511ecb8021b81f355cb2d629887edeef
Merge branch 'security/emoji-xss' into 'develop'

formatter: don't add XSS emoji

See merge request pleroma/pleroma!322