projects
/
akkoma
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
combined
(merge:
e4f1d8f
d0c2479
)
Merge branch 'features/hashtag-column' into 'develop'
author
Haelwenn
<contact+git.pleroma.social@hacktivis.me>
Mon, 28 Dec 2020 10:14:58 +0000
(10:14 +0000)
committer
Haelwenn
<contact+git.pleroma.social@hacktivis.me>
Mon, 28 Dec 2020 10:14:58 +0000
(10:14 +0000)
Insert text representation of hashtags into object["hashtags"]
See merge request pleroma/pleroma!2824
1
2
CHANGELOG.md
patch
|
diff1
|
diff2
|
blob
|
history
lib/pleroma/object.ex
patch
|
diff1
|
diff2
|
blob
|
history
lib/pleroma/web/activity_pub/activity_pub.ex
patch
|
diff1
|
diff2
|
blob
|
history
test/pleroma/activity/ir/topics_test.exs
patch
|
diff1
|
diff2
|
blob
|
history
test/pleroma/web/mastodon_api/views/status_view_test.exs
patch
|
diff1
|
diff2
|
blob
|
history
diff --cc
CHANGELOG.md
Simple merge
diff --cc
lib/pleroma/object.ex
Simple merge
diff --cc
lib/pleroma/web/activity_pub/activity_pub.ex
Simple merge
diff --cc
test/pleroma/activity/ir/topics_test.exs
Simple merge
diff --cc
test/pleroma/web/mastodon_api/views/status_view_test.exs
Simple merge