Merge branch 'replies-domain-block' into 'develop'
authorlain <lain@soykaf.club>
Tue, 2 Jun 2020 14:14:23 +0000 (14:14 +0000)
committerlain <lain@soykaf.club>
Tue, 2 Jun 2020 14:14:23 +0000 (14:14 +0000)
commit879304dcd94c778b3cdaa2b82f69fccf2b37090c
tree324d8e0cfa1f73f5180af462ebb95cba0cc6c769
parent5da38c15cd9b1701d5ca52be1036f2865c9f884e
parent19f468c5bc230d6790b00aa87e509a07e709aaa7
Merge branch 'replies-domain-block' into 'develop'

Replies domain block

Closes #1650

See merge request pleroma/pleroma!2622
lib/pleroma/web/activity_pub/activity_pub.ex
test/web/mastodon_api/controllers/timeline_controller_test.exs