Merge branch 'develop' of git.pleroma.social:pleroma/pleroma into remake-remodel-dms

author lain <lain@soykaf.club>

Thu, 7 May 2020 13:05:40 +0000 (15:05 +0200)

committer lain <lain@soykaf.club>

Thu, 7 May 2020 13:05:40 +0000 (15:05 +0200)
author lain <lain@soykaf.club>
Thu, 7 May 2020 13:05:40 +0000 (15:05 +0200)
committer lain <lain@soykaf.club>
Thu, 7 May 2020 13:05:40 +0000 (15:05 +0200)
diff --cc lib/pleroma/web/activity_pub/activity_pub.ex
Simple merge
diff --cc lib/pleroma/web/common_api/utils.ex
Simple merge
diff --cc lib/pleroma/web/router.ex
Simple merge
author	lain <lain@soykaf.club>
	Thu, 7 May 2020 13:05:40 +0000 (15:05 +0200)
committer	lain <lain@soykaf.club>
	Thu, 7 May 2020 13:05:40 +0000 (15:05 +0200)
		1	2
lib/pleroma/web/activity_pub/activity_pub.ex	patch \|	diff1 \|	diff2 \|	blob \| history
lib/pleroma/web/common_api/utils.ex	patch \|	diff1 \|	diff2 \|	blob \| history
lib/pleroma/web/router.ex	patch \|	diff1 \|	diff2 \|	blob \| history