Merge remote-tracking branch 'origin/develop' into fix-slow-relationships

author lain <lain@soykaf.club>

Tue, 2 Apr 2019 14:10:38 +0000 (16:10 +0200)

committer lain <lain@soykaf.club>

Tue, 2 Apr 2019 14:10:38 +0000 (16:10 +0200)
author lain <lain@soykaf.club>
Tue, 2 Apr 2019 14:10:38 +0000 (16:10 +0200)
committer lain <lain@soykaf.club>
Tue, 2 Apr 2019 14:10:38 +0000 (16:10 +0200)
diff --cc lib/pleroma/web/activity_pub/utils.ex
Simple merge
diff --cc test/web/activity_pub/activity_pub_test.exs
Simple merge
author	lain <lain@soykaf.club>
	Tue, 2 Apr 2019 14:10:38 +0000 (16:10 +0200)
committer	lain <lain@soykaf.club>
	Tue, 2 Apr 2019 14:10:38 +0000 (16:10 +0200)
		1	2
lib/pleroma/web/activity_pub/utils.ex	patch \|	diff1 \|	diff2 \|	blob \| history
test/web/activity_pub/activity_pub_test.exs	patch \|	diff1 \|	diff2 \|	blob \| history