diff options
author | scarlett <nia@netbsd.org> | 2019-01-05 21:52:02 +0000 |
---|---|---|
committer | scarlett <nia@netbsd.org> | 2019-01-05 21:52:02 +0000 |
commit | 145d6fe6e9f3c9414b1231da7f200e007413b31b (patch) | |
tree | 3e5a3d4c66a81afa1590c3365142ab5358cc7cc8 /lib/jason_types.ex | |
parent | ba17518a0aff404e265f4aebec1257912ad2750c (diff) | |
parent | 57df7d6e1da1a94a3866afc9b6d353aea602d4d3 (diff) | |
download | pleroma-145d6fe6e9f3c9414b1231da7f200e007413b31b.tar.gz |
Merge branch 'emoji-in-summary' into 'develop'
Strip HTML in and allow emoji in summaries.
See merge request pleroma/pleroma!631
Diffstat (limited to 'lib/jason_types.ex')
0 files changed, 0 insertions, 0 deletions