Merge branch 'fix/domain-unblocked-reblogs' into 'develop'

author feld <feld@feld.me>

Thu, 16 May 2019 18:57:14 +0000 (18:57 +0000)

committer feld <feld@feld.me>

Thu, 16 May 2019 18:57:14 +0000 (18:57 +0000)
author feld <feld@feld.me>
Thu, 16 May 2019 18:57:14 +0000 (18:57 +0000)
committer feld <feld@feld.me>
Thu, 16 May 2019 18:57:14 +0000 (18:57 +0000)
diff --cc lib/pleroma/web/activity_pub/activity_pub.ex
Simple merge
diff --cc test/web/activity_pub/activity_pub_test.exs
Simple merge
author	feld <feld@feld.me>
	Thu, 16 May 2019 18:57:14 +0000 (18:57 +0000)
committer	feld <feld@feld.me>
	Thu, 16 May 2019 18:57:14 +0000 (18:57 +0000)
		1	2
lib/pleroma/web/activity_pub/activity_pub.ex	patch \|	diff1 \|	diff2 \|	blob \| history
test/web/activity_pub/activity_pub_test.exs	patch \|	diff1 \|	diff2 \|	blob \| history