diff options
| author | rinpatch <rinpatch@sdf.org> | 2020-04-20 18:30:01 +0000 |
|---|---|---|
| committer | rinpatch <rinpatch@sdf.org> | 2020-04-20 18:30:01 +0000 |
| commit | e57c1b60e4a0f882d5217bf1be8b1a7240aa322d (patch) | |
| tree | c434f6400c46b5b166434d43b6ffdab98631459c /config/config.exs | |
| parent | 7e456ac7f622f5524b74fbe45a16a58eb30551ff (diff) | |
| parent | bedc558809832ce6ef6063fe91656a0fff0e222c (diff) | |
| download | pleroma-e57c1b60e4a0f882d5217bf1be8b1a7240aa322d.tar.gz pleroma-e57c1b60e4a0f882d5217bf1be8b1a7240aa322d.zip | |
Merge branch 'accept-deletes' into 'develop'
Always accept deletions through SimplePolicy, add :reject_deletes group
See merge request pleroma/pleroma!2371
Diffstat (limited to 'config/config.exs')
| -rw-r--r-- | config/config.exs | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/config/config.exs b/config/config.exs index f44837e24..2e538c4be 100644 --- a/config/config.exs +++ b/config/config.exs @@ -336,7 +336,8 @@ config :pleroma, :mrf_simple, reject: [], accept: [], avatar_removal: [], - banner_removal: [] + banner_removal: [], + reject_deletes: [] config :pleroma, :mrf_keyword, reject: [], |