Merge branch 'develop' into feature/database-compaction

author rinpatch <rinpatch@sdf.org>

Thu, 18 Apr 2019 09:56:38 +0000 (12:56 +0300)

committer rinpatch <rinpatch@sdf.org>

Thu, 18 Apr 2019 09:56:38 +0000 (12:56 +0300)
author rinpatch <rinpatch@sdf.org>
Thu, 18 Apr 2019 09:56:38 +0000 (12:56 +0300)
committer rinpatch <rinpatch@sdf.org>
Thu, 18 Apr 2019 09:56:38 +0000 (12:56 +0300)
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	rinpatch <rinpatch@sdf.org>
	Thu, 18 Apr 2019 09:56:38 +0000 (12:56 +0300)
committer	rinpatch <rinpatch@sdf.org>
	Thu, 18 Apr 2019 09:56:38 +0000 (12:56 +0300)
		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