Merge remote-tracking branch 'remotes/origin/develop' into 1505-threads-federation

author Ivan Tashkinov <ivantashkinov@gmail.com>

Sat, 8 Feb 2020 16:59:37 +0000 (19:59 +0300)

committer Ivan Tashkinov <ivantashkinov@gmail.com>

Sat, 8 Feb 2020 16:59:37 +0000 (19:59 +0300)
author Ivan Tashkinov <ivantashkinov@gmail.com>
Sat, 8 Feb 2020 16:59:37 +0000 (19:59 +0300)
committer Ivan Tashkinov <ivantashkinov@gmail.com>
Sat, 8 Feb 2020 16:59:37 +0000 (19:59 +0300)
diff --cc CHANGELOG.md
Simple merge
diff --cc config/config.exs
Simple merge
diff --cc config/description.exs
Simple merge
diff --cc lib/pleroma/activity.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	Ivan Tashkinov <ivantashkinov@gmail.com>
	Sat, 8 Feb 2020 16:59:37 +0000 (19:59 +0300)
committer	Ivan Tashkinov <ivantashkinov@gmail.com>
	Sat, 8 Feb 2020 16:59:37 +0000 (19:59 +0300)
		1	2
CHANGELOG.md	patch \|	diff1 \|	diff2 \|	blob \| history
config/config.exs	patch \|	diff1 \|	diff2 \|	blob \| history
config/description.exs	patch \|	diff1 \|	diff2 \|	blob \| history
lib/pleroma/activity.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