diff options
| author | rinpatch <rin@patch.cx> | 2021-03-19 08:48:22 +0000 |
|---|---|---|
| committer | rinpatch <rin@patch.cx> | 2021-03-19 08:48:22 +0000 |
| commit | f930e83fa2a7e2184ca6bd09773d81568e7c755c (patch) | |
| tree | 2b2323d9f5f26dee318a7586fa0ecafa907fc0ca /config | |
| parent | 67bde35e710e7c3c800364b4ab94a3fd81833ffa (diff) | |
| parent | 3bc7d122712b5cc35ba509542bde63ca130d6a40 (diff) | |
| download | pleroma-f930e83fa2a7e2184ca6bd09773d81568e7c755c.tar.gz | |
Merge branch 'fix/remove_auto_nsfw' into 'develop'
Remove sensitive setting #nsfw
See merge request pleroma/pleroma!3223
Diffstat (limited to 'config')
| -rw-r--r-- | config/config.exs | 5 |
1 files changed, 5 insertions, 0 deletions
diff --git a/config/config.exs b/config/config.exs index 23ada389b..8d1e17b42 100644 --- a/config/config.exs +++ b/config/config.exs @@ -391,6 +391,11 @@ config :pleroma, :mrf_keyword, federated_timeline_removal: [], replace: [] +config :pleroma, :mrf_hashtag, + sensitive: ["nsfw"], + reject: [], + federated_timeline_removal: [] + config :pleroma, :mrf_subchain, match_actor: %{} config :pleroma, :mrf_activity_expiration, days: 365 |