Merge branch 'fix/remove_auto_nsfw' into 'develop'

author rinpatch <rin@patch.cx>

Fri, 19 Mar 2021 08:48:22 +0000 (08:48 +0000)

committer rinpatch <rin@patch.cx>

Fri, 19 Mar 2021 08:48:22 +0000 (08:48 +0000)
author rinpatch <rin@patch.cx>
Fri, 19 Mar 2021 08:48:22 +0000 (08:48 +0000)
committer rinpatch <rin@patch.cx>
Fri, 19 Mar 2021 08:48:22 +0000 (08:48 +0000)
diff --cc CHANGELOG.md
Simple merge
diff --cc config/config.exs
Simple merge
diff --cc docs/configuration/cheatsheet.md
Simple merge
diff --cc lib/pleroma/web/common_api/activity_draft.ex
Simple merge
diff --cc test/pleroma/web/activity_pub/transmogrifier_test.exs
Simple merge
author	rinpatch <rin@patch.cx>
	Fri, 19 Mar 2021 08:48:22 +0000 (08:48 +0000)
committer	rinpatch <rin@patch.cx>
	Fri, 19 Mar 2021 08:48:22 +0000 (08:48 +0000)
		1	2
CHANGELOG.md	patch \|	diff1 \|	diff2 \|	blob \| history
config/config.exs	patch \|	diff1 \|	diff2 \|	blob \| history
docs/configuration/cheatsheet.md	patch \|	diff1 \|	diff2 \|	blob \| history
lib/pleroma/web/common_api/activity_draft.ex	patch \|	diff1 \|	diff2 \|	blob \| history
test/pleroma/web/activity_pub/transmogrifier_test.exs	patch \|	diff1 \|	diff2 \|	blob \| history