Merge branch 'emoji-in-summary' into 'develop'
authorscarlett <nia@netbsd.org>
Sat, 5 Jan 2019 21:52:02 +0000 (21:52 +0000)
committerscarlett <nia@netbsd.org>
Sat, 5 Jan 2019 21:52:02 +0000 (21:52 +0000)
commit145d6fe6e9f3c9414b1231da7f200e007413b31b
tree3e5a3d4c66a81afa1590c3365142ab5358cc7cc8
parentba17518a0aff404e265f4aebec1257912ad2750c
parent57df7d6e1da1a94a3866afc9b6d353aea602d4d3
Merge branch 'emoji-in-summary' into 'develop'

Strip HTML in and allow emoji in summaries.

See merge request pleroma/pleroma!631
lib/pleroma/web/twitter_api/views/activity_view.ex