Merge branch 'develop' into feature/move-activity

author Egor Kislitsyn <egor@kislitsyn.com>

Mon, 28 Oct 2019 08:10:47 +0000 (15:10 +0700)

committer Egor Kislitsyn <egor@kislitsyn.com>

Mon, 28 Oct 2019 08:10:47 +0000 (15:10 +0700)
author Egor Kislitsyn <egor@kislitsyn.com>
Mon, 28 Oct 2019 08:10:47 +0000 (15:10 +0700)
committer Egor Kislitsyn <egor@kislitsyn.com>
Mon, 28 Oct 2019 08:10:47 +0000 (15:10 +0700)
diff --cc lib/pleroma/user.ex
Simple merge
diff --cc lib/pleroma/web/activity_pub/activity_pub.ex
Simple merge
diff --cc lib/pleroma/web/activity_pub/transmogrifier.ex
Simple merge
diff --cc test/web/activity_pub/transmogrifier_test.exs
Simple merge
author	Egor Kislitsyn <egor@kislitsyn.com>
	Mon, 28 Oct 2019 08:10:47 +0000 (15:10 +0700)
committer	Egor Kislitsyn <egor@kislitsyn.com>
	Mon, 28 Oct 2019 08:10:47 +0000 (15:10 +0700)
		1	2
lib/pleroma/user.ex	patch \|	diff1 \|	diff2 \|	blob \| history
lib/pleroma/web/activity_pub/activity_pub.ex	patch \|	diff1 \|	diff2 \|	blob \| history
lib/pleroma/web/activity_pub/transmogrifier.ex	patch \|	diff1 \|	diff2 \|	blob \| history
test/web/activity_pub/transmogrifier_test.exs	patch \|	diff1 \|	diff2 \|	blob \| history