Merge branch 'fix/blocked-user-boosts' into 'develop'

author lambda <pleromagit@rogerbraun.net>

Sat, 28 Apr 2018 13:49:12 +0000 (13:49 +0000)

committer lambda <pleromagit@rogerbraun.net>

Sat, 28 Apr 2018 13:49:12 +0000 (13:49 +0000)
author lambda <pleromagit@rogerbraun.net>
Sat, 28 Apr 2018 13:49:12 +0000 (13:49 +0000)
committer lambda <pleromagit@rogerbraun.net>
Sat, 28 Apr 2018 13:49:12 +0000 (13:49 +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	lambda <pleromagit@rogerbraun.net>
	Sat, 28 Apr 2018 13:49:12 +0000 (13:49 +0000)
committer	lambda <pleromagit@rogerbraun.net>
	Sat, 28 Apr 2018 13:49:12 +0000 (13:49 +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