Merge branch 'misskey-compat' into 'reactions'

author lain <lain@soykaf.club>

Mon, 7 Oct 2019 07:25:27 +0000 (07:25 +0000)

committer lain <lain@soykaf.club>

Mon, 7 Oct 2019 07:25:27 +0000 (07:25 +0000)
author lain <lain@soykaf.club>
Mon, 7 Oct 2019 07:25:27 +0000 (07:25 +0000)
committer lain <lain@soykaf.club>
Mon, 7 Oct 2019 07:25:27 +0000 (07:25 +0000)
diff --cc lib/pleroma/web/activity_pub/transmogrifier.ex
Simple merge
diff --cc test/web/activity_pub/transmogrifier_test.exs
Simple merge
author	lain <lain@soykaf.club>
	Mon, 7 Oct 2019 07:25:27 +0000 (07:25 +0000)
committer	lain <lain@soykaf.club>
	Mon, 7 Oct 2019 07:25:27 +0000 (07:25 +0000)
		1	2
lib/pleroma/web/activity_pub/transmogrifier.ex	patch \|	diff1 \|	diff2 \|	blob \| history
test/web/activity_pub/transmogrifier_test.exs	patch \|	diff1 \|	diff2 \|	blob \| history