projects
/
akkoma
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
combined
(merge:
ba17518
57df7d6
)
Merge branch 'emoji-in-summary' into 'develop'
author
scarlett
<nia@netbsd.org>
Sat, 5 Jan 2019 21:52:02 +0000
(21:52 +0000)
committer
scarlett
<nia@netbsd.org>
Sat, 5 Jan 2019 21:52:02 +0000
(21:52 +0000)
Strip HTML in and allow emoji in summaries.
See merge request pleroma/pleroma!631
1
2
lib/pleroma/web/twitter_api/views/activity_view.ex
patch
|
diff1
|
diff2
|
blob
|
history
diff --cc
lib/pleroma/web/twitter_api/views/activity_view.ex
Simple merge