Merge branch 'develop' into feature/activitypub

author lain <lain@soykaf.club>

Mon, 12 Feb 2018 09:24:15 +0000 (10:24 +0100)

committer lain <lain@soykaf.club>

Mon, 12 Feb 2018 09:24:15 +0000 (10:24 +0100)
author lain <lain@soykaf.club>
Mon, 12 Feb 2018 09:24:15 +0000 (10:24 +0100)
committer lain <lain@soykaf.club>
Mon, 12 Feb 2018 09:24:15 +0000 (10:24 +0100)
diff --cc lib/pleroma/web/ostatus/ostatus_controller.ex
Simple merge
diff --cc test/user_test.exs
Simple merge
diff --cc test/web/activity_pub/activity_pub_test.exs
Simple merge
author	lain <lain@soykaf.club>
	Mon, 12 Feb 2018 09:24:15 +0000 (10:24 +0100)
committer	lain <lain@soykaf.club>
	Mon, 12 Feb 2018 09:24:15 +0000 (10:24 +0100)
		1	2
lib/pleroma/web/ostatus/ostatus_controller.ex	patch \|	diff1 \|	diff2 \|	blob \| history
test/user_test.exs	patch \|	diff1 \|	diff2 \|	blob \| history
test/web/activity_pub/activity_pub_test.exs	patch \|	diff1 \|	diff2 \|	blob \| history