Merge remote-tracking branch 'remotes/origin/develop' into feature/object-hashtags...

author Ivan Tashkinov <ivantashkinov@gmail.com>

Mon, 25 Jan 2021 18:24:07 +0000 (21:24 +0300)

committer Ivan Tashkinov <ivantashkinov@gmail.com>

Mon, 25 Jan 2021 18:24:07 +0000 (21:24 +0300)
author Ivan Tashkinov <ivantashkinov@gmail.com>
Mon, 25 Jan 2021 18:24:07 +0000 (21:24 +0300)
committer Ivan Tashkinov <ivantashkinov@gmail.com>
Mon, 25 Jan 2021 18:24:07 +0000 (21:24 +0300)
diff --cc CHANGELOG.md
Simple merge
diff --cc lib/pleroma/web/activity_pub/activity_pub.ex
Simple merge
diff --cc test/pleroma/web/activity_pub/transmogrifier/note_handling_test.exs
Simple merge
diff --cc test/pleroma/web/common_api_test.exs
Simple merge
author	Ivan Tashkinov <ivantashkinov@gmail.com>
	Mon, 25 Jan 2021 18:24:07 +0000 (21:24 +0300)
committer	Ivan Tashkinov <ivantashkinov@gmail.com>
	Mon, 25 Jan 2021 18:24:07 +0000 (21:24 +0300)
		1	2
CHANGELOG.md	patch \|	diff1 \|	diff2 \|	blob \| history
lib/pleroma/web/activity_pub/activity_pub.ex	patch \|	diff1 \|	diff2 \|	blob \| history
test/pleroma/web/activity_pub/transmogrifier/note_handling_test.exs	patch \|	diff1 \|	diff2 \|	blob \| history
test/pleroma/web/common_api_test.exs	patch \|	diff1 \|	diff2 \|	blob \| history