Merge remote-tracking branch 'upstream/develop' into attachment-meta

author Alex Gleason <alex@alexgleason.me>

Thu, 13 May 2021 01:10:52 +0000 (20:10 -0500)

committer Alex Gleason <alex@alexgleason.me>

Thu, 13 May 2021 01:10:52 +0000 (20:10 -0500)
author Alex Gleason <alex@alexgleason.me>
Thu, 13 May 2021 01:10:52 +0000 (20:10 -0500)
committer Alex Gleason <alex@alexgleason.me>
Thu, 13 May 2021 01:10:52 +0000 (20:10 -0500)
diff --cc lib/pleroma/web/activity_pub/object_validators/attachment_validator.ex
Simple merge
diff --cc lib/pleroma/web/activity_pub/transmogrifier.ex
Simple merge
diff --cc lib/pleroma/web/mastodon_api/views/status_view.ex
Simple merge
diff --cc test/pleroma/web/mastodon_api/views/status_view_test.exs
Simple merge
author	Alex Gleason <alex@alexgleason.me>
	Thu, 13 May 2021 01:10:52 +0000 (20:10 -0500)
committer	Alex Gleason <alex@alexgleason.me>
	Thu, 13 May 2021 01:10:52 +0000 (20:10 -0500)
		1	2
lib/pleroma/web/activity_pub/object_validators/attachment_validator.ex	patch \|	diff1 \|	diff2 \|	blob \| history
lib/pleroma/web/activity_pub/transmogrifier.ex	patch \|	diff1 \|	diff2 \|	blob \| history
lib/pleroma/web/mastodon_api/views/status_view.ex	patch \|	diff1 \|	diff2 \|	blob \| history
test/pleroma/web/mastodon_api/views/status_view_test.exs	patch \|	diff1 \|	diff2 \|	blob \| history