projects
/
akkoma
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
combined
(merge:
b58e4dd
de956b9
)
Merge branch 'features/mastoapi-multi-hashtag' into 'develop'
author
kaniini
<nenolod@gmail.com>
Sun, 27 Jan 2019 12:45:50 +0000
(12:45 +0000)
committer
kaniini
<nenolod@gmail.com>
Sun, 27 Jan 2019 12:45:50 +0000
(12:45 +0000)
MastodonAPI multi-hashtag
See merge request pleroma/pleroma!652
1
2
lib/pleroma/web/activity_pub/activity_pub.ex
patch
|
diff1
|
diff2
|
blob
|
history
lib/pleroma/web/mastodon_api/mastodon_api_controller.ex
patch
|
diff1
|
diff2
|
blob
|
history
test/web/activity_pub/activity_pub_test.exs
patch
|
diff1
|
diff2
|
blob
|
history
test/web/mastodon_api/mastodon_api_controller_test.exs
patch
|
diff1
|
diff2
|
blob
|
history
diff --cc
lib/pleroma/web/activity_pub/activity_pub.ex
Simple merge
diff --cc
lib/pleroma/web/mastodon_api/mastodon_api_controller.ex
Simple merge
diff --cc
test/web/activity_pub/activity_pub_test.exs
Simple merge
diff --cc
test/web/mastodon_api/mastodon_api_controller_test.exs
Simple merge
projects / akkoma / commitdiff