Merge branch 'develop' of git.pleroma.social:pleroma/pleroma into features/poll-valid...

author lain <lain@soykaf.club>

Wed, 5 Aug 2020 09:12:14 +0000 (11:12 +0200)

committer lain <lain@soykaf.club>

Wed, 5 Aug 2020 09:12:14 +0000 (11:12 +0200)
author lain <lain@soykaf.club>
Wed, 5 Aug 2020 09:12:14 +0000 (11:12 +0200)
committer lain <lain@soykaf.club>
Wed, 5 Aug 2020 09:12:14 +0000 (11:12 +0200)
diff --cc lib/pleroma/web/activity_pub/object_validators/common_validations.ex
Simple merge
diff --cc test/web/activity_pub/transmogrifier_test.exs
Simple merge
author	lain <lain@soykaf.club>
	Wed, 5 Aug 2020 09:12:14 +0000 (11:12 +0200)
committer	lain <lain@soykaf.club>
	Wed, 5 Aug 2020 09:12:14 +0000 (11:12 +0200)
		1	2
lib/pleroma/web/activity_pub/object_validators/common_validations.ex	patch \|	diff1 \|	diff2 \|	blob \| history
test/web/activity_pub/transmogrifier_test.exs	patch \|	diff1 \|	diff2 \|	blob \| history