Merge branch 'features/ingestion-page' into 'develop'

author Haelwenn <contact+git.pleroma.social@hacktivis.me>

Mon, 12 Jul 2021 05:05:49 +0000 (05:05 +0000)

committer Haelwenn <contact+git.pleroma.social@hacktivis.me>

Mon, 12 Jul 2021 05:05:49 +0000 (05:05 +0000)
author Haelwenn <contact+git.pleroma.social@hacktivis.me>
Mon, 12 Jul 2021 05:05:49 +0000 (05:05 +0000)
committer Haelwenn <contact+git.pleroma.social@hacktivis.me>
Mon, 12 Jul 2021 05:05:49 +0000 (05:05 +0000)
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/side_effects.ex
Simple merge
author	Haelwenn <contact+git.pleroma.social@hacktivis.me>
	Mon, 12 Jul 2021 05:05:49 +0000 (05:05 +0000)
committer	Haelwenn <contact+git.pleroma.social@hacktivis.me>
	Mon, 12 Jul 2021 05:05:49 +0000 (05:05 +0000)
		1	2
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/side_effects.ex	patch \|	diff1 \|	diff2 \|	blob \| history