diff options
| author | Egor Kislitsyn <egor@kislitsyn.com> | 2020-04-24 18:37:58 +0400 |
|---|---|---|
| committer | Egor Kislitsyn <egor@kislitsyn.com> | 2020-04-24 18:37:58 +0400 |
| commit | c56c0a3d23929f166f4d95e5c6e96bbf0df8a35e (patch) | |
| tree | 6b6fffe4faeebbf7e103d16a427f6f68774b44d5 /config/config.exs | |
| parent | 364eecc49f137ae3c7798ad240983591e27b134c (diff) | |
| parent | 2430b9bf90d6fde71885f5f0f8be767526be6208 (diff) | |
| download | pleroma-c56c0a3d23929f166f4d95e5c6e96bbf0df8a35e.tar.gz | |
Merge branch 'develop' into global-status-expiration
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 2517fed59..7ace09b87 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: [], |