Merge branch 'develop' into fix/mrf-delete

author rinpatch <rinpatch@sdf.org>

Thu, 5 Dec 2019 21:12:21 +0000 (00:12 +0300)

committer rinpatch <rinpatch@sdf.org>

Thu, 5 Dec 2019 21:12:21 +0000 (00:12 +0300)
author rinpatch <rinpatch@sdf.org>
Thu, 5 Dec 2019 21:12:21 +0000 (00:12 +0300)
committer rinpatch <rinpatch@sdf.org>
Thu, 5 Dec 2019 21:12:21 +0000 (00:12 +0300)
diff --cc CHANGELOG.md
Simple merge
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, 5 Dec 2019 21:12:21 +0000 (00:12 +0300)
committer	rinpatch <rinpatch@sdf.org>
	Thu, 5 Dec 2019 21:12:21 +0000 (00:12 +0300)
		1	2
CHANGELOG.md	patch \|	diff1 \|	diff2 \|	blob \| history
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