Merge branch 'feature/domain-blocks' into 'develop'

author lambda <pleromagit@rogerbraun.net>

Mon, 11 Jun 2018 11:19:45 +0000 (11:19 +0000)

committer lambda <pleromagit@rogerbraun.net>

Mon, 11 Jun 2018 11:19:45 +0000 (11:19 +0000)
author lambda <pleromagit@rogerbraun.net>
Mon, 11 Jun 2018 11:19:45 +0000 (11:19 +0000)
committer lambda <pleromagit@rogerbraun.net>
Mon, 11 Jun 2018 11:19:45 +0000 (11:19 +0000)
diff --cc lib/pleroma/user.ex
Simple merge
diff --cc lib/pleroma/web/activity_pub/activity_pub.ex
Simple merge
diff --cc lib/pleroma/web/mastodon_api/mastodon_api_controller.ex
Simple merge
diff --cc test/web/mastodon_api/mastodon_api_controller_test.exs
Simple merge
author	lambda <pleromagit@rogerbraun.net>
	Mon, 11 Jun 2018 11:19:45 +0000 (11:19 +0000)
committer	lambda <pleromagit@rogerbraun.net>
	Mon, 11 Jun 2018 11:19:45 +0000 (11:19 +0000)
		1	2
lib/pleroma/user.ex	patch \|	diff1 \|	diff2 \|	blob \| history
lib/pleroma/web/activity_pub/activity_pub.ex	patch \|	diff1 \|	diff2 \|	blob \| history
lib/pleroma/web/mastodon_api/mastodon_api_controller.ex	patch \|	diff1 \|	diff2 \|	blob \| history
test/web/mastodon_api/mastodon_api_controller_test.exs	patch \|	diff1 \|	diff2 \|	blob \| history