Merge branch 'develop' of git.pleroma.social:pleroma/pleroma into feature/delete...

[akkoma] / config / config.exs

diff --git a/config/config.exs b/config/config.exs
index f44837e24efe38ec3dfc8b234f1e1bb5fa636309..a6c6d6f99e7c593caffe00062d61671eea94d121 100644 (file)
--- 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: [],
@@ -561,8 +562,6 @@ config :pleroma, :email_notifications,
     inactivity_threshold: 7
   }
 
-config :pleroma, :notifications, enable_follow_request_notifications: false
-
 config :pleroma, :oauth2,
   token_expires_in: 600,
   issue_new_refresh_token: true,