projects
/
akkoma
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
combined
(merge:
9dbf493
cc98d01
)
Merge branch 'relay-list-change' into 'develop'
author
feld
<feld@feld.me>
Wed, 11 Mar 2020 15:10:09 +0000
(15:10 +0000)
committer
feld
<feld@feld.me>
Wed, 11 Mar 2020 15:10:09 +0000
(15:10 +0000)
Relay list shows hosts without accepted follow
See merge request pleroma/pleroma!2240
1
2
lib/mix/tasks/pleroma/relay.ex
patch
|
diff1
|
diff2
|
blob
|
history
test/tasks/relay_test.exs
patch
|
diff1
|
diff2
|
blob
|
history
test/web/activity_pub/activity_pub_controller_test.exs
patch
|
diff1
|
diff2
|
blob
|
history
diff --cc
lib/mix/tasks/pleroma/relay.ex
Simple merge
diff --cc
test/tasks/relay_test.exs
Simple merge
diff --cc
test/web/activity_pub/activity_pub_controller_test.exs
Simple merge