Merge branch '534_federation_targets_reachability' into 'develop'
authorhref <href+git-pleroma@random.sh>
Fri, 1 Feb 2019 09:14:35 +0000 (09:14 +0000)
committerhref <href+git-pleroma@random.sh>
Fri, 1 Feb 2019 09:14:35 +0000 (09:14 +0000)
[#534] Unreachable federation targets retirement

Closes #534

See merge request pleroma/pleroma!703

1  2 
config/config.exs
docs/config.md
lib/pleroma/web/activity_pub/activity_pub.ex
test/support/http_request_mock.ex
test/web/activity_pub/activity_pub_test.exs

Simple merge
diff --cc docs/config.md
Simple merge
Simple merge