Merge branch 'develop' of https://git.pleroma.social/pleroma/pleroma into feature...

author Francis Dinh <normandy@firemail.cc>

Wed, 25 Apr 2018 04:46:28 +0000 (00:46 -0400)

committer Francis Dinh <normandy@firemail.cc>

Wed, 25 Apr 2018 04:46:28 +0000 (00:46 -0400)
author Francis Dinh <normandy@firemail.cc>
Wed, 25 Apr 2018 04:46:28 +0000 (00:46 -0400)
committer Francis Dinh <normandy@firemail.cc>
Wed, 25 Apr 2018 04:46:28 +0000 (00:46 -0400)
diff --cc lib/pleroma/web/activity_pub/activity_pub.ex
Simple merge
diff --cc lib/pleroma/web/activity_pub/utils.ex
Simple merge
diff --cc lib/pleroma/web/common_api/common_api.ex
Simple merge
diff --cc lib/pleroma/web/mastodon_api/mastodon_api_controller.ex
Simple merge
diff --cc test/web/activity_pub/activity_pub_test.exs
Simple merge
author	Francis Dinh <normandy@firemail.cc>
	Wed, 25 Apr 2018 04:46:28 +0000 (00:46 -0400)
committer	Francis Dinh <normandy@firemail.cc>
	Wed, 25 Apr 2018 04:46:28 +0000 (00:46 -0400)
		1	2
lib/pleroma/web/activity_pub/activity_pub.ex	patch \|	diff1 \|	diff2 \|	blob \| history
lib/pleroma/web/activity_pub/utils.ex	patch \|	diff1 \|	diff2 \|	blob \| history
lib/pleroma/web/common_api/common_api.ex	patch \|	diff1 \|	diff2 \|	blob \| history
lib/pleroma/web/mastodon_api/mastodon_api_controller.ex	patch \|	diff1 \|	diff2 \|	blob \| history
test/web/activity_pub/activity_pub_test.exs	patch \|	diff1 \|	diff2 \|	blob \| history