Merge branch 'fix/remove_auto_nsfw' into 'develop'
authorrinpatch <rin@patch.cx>
Fri, 19 Mar 2021 08:48:22 +0000 (08:48 +0000)
committerrinpatch <rin@patch.cx>
Fri, 19 Mar 2021 08:48:22 +0000 (08:48 +0000)
commitf930e83fa2a7e2184ca6bd09773d81568e7c755c
tree2b2323d9f5f26dee318a7586fa0ecafa907fc0ca
parent67bde35e710e7c3c800364b4ab94a3fd81833ffa
parent3bc7d122712b5cc35ba509542bde63ca130d6a40
Merge branch 'fix/remove_auto_nsfw' into 'develop'

Remove sensitive setting #nsfw

See merge request pleroma/pleroma!3223
CHANGELOG.md
config/config.exs
docs/configuration/cheatsheet.md
lib/pleroma/web/common_api/activity_draft.ex
test/pleroma/web/activity_pub/transmogrifier_test.exs