projects
/
akkoma
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
combined
(merge:
5da38c1
19f468c
)
Merge branch 'replies-domain-block' into 'develop'
author
lain
<lain@soykaf.club>
Tue, 2 Jun 2020 14:14:23 +0000
(14:14 +0000)
committer
lain
<lain@soykaf.club>
Tue, 2 Jun 2020 14:14:23 +0000
(14:14 +0000)
Replies domain block
Closes #1650
See merge request pleroma/pleroma!2622
1
2
lib/pleroma/web/activity_pub/activity_pub.ex
patch
|
diff1
|
diff2
|
blob
|
history
test/web/mastodon_api/controllers/timeline_controller_test.exs
patch
|
diff1
|
diff2
|
blob
|
history
diff --cc
lib/pleroma/web/activity_pub/activity_pub.ex
Simple merge
diff --cc
test/web/mastodon_api/controllers/timeline_controller_test.exs
Simple merge
projects / akkoma / commitdiff