Merge remote-tracking branch 'pleroma/develop' into features/poll-validation

author Haelwenn (lanodan) Monnier <contact@hacktivis.me>

Fri, 31 Jul 2020 11:57:21 +0000 (13:57 +0200)

committer Haelwenn (lanodan) Monnier <contact@hacktivis.me>

Fri, 31 Jul 2020 11:57:21 +0000 (13:57 +0200)
author Haelwenn (lanodan) Monnier <contact@hacktivis.me>
Fri, 31 Jul 2020 11:57:21 +0000 (13:57 +0200)
committer Haelwenn (lanodan) Monnier <contact@hacktivis.me>
Fri, 31 Jul 2020 11:57:21 +0000 (13:57 +0200)
diff --cc lib/pleroma/object/fetcher.ex
Simple merge
diff --cc lib/pleroma/web/activity_pub/activity_pub.ex
Simple merge
diff --cc lib/pleroma/web/activity_pub/object_validator.ex
Simple merge
diff --cc lib/pleroma/web/activity_pub/transmogrifier.ex
Simple merge
diff --cc test/web/activity_pub/transmogrifier_test.exs
Simple merge
author	Haelwenn (lanodan) Monnier <contact@hacktivis.me>
	Fri, 31 Jul 2020 11:57:21 +0000 (13:57 +0200)
committer	Haelwenn (lanodan) Monnier <contact@hacktivis.me>
	Fri, 31 Jul 2020 11:57:21 +0000 (13:57 +0200)
		1	2
lib/pleroma/object/fetcher.ex	patch \|	diff1 \|	diff2 \|	blob \| history
lib/pleroma/web/activity_pub/activity_pub.ex	patch \|	diff1 \|	diff2 \|	blob \| history
lib/pleroma/web/activity_pub/object_validator.ex	patch \|	diff1 \|	diff2 \|	blob \| history
lib/pleroma/web/activity_pub/transmogrifier.ex	patch \|	diff1 \|	diff2 \|	blob \| history
test/web/activity_pub/transmogrifier_test.exs	patch \|	diff1 \|	diff2 \|	blob \| history