Merge branch 'develop' into openapi/reports

[akkoma] / config / config.exs

diff --git a/config/config.exs b/config/config.exs
index 7f013aaad71f65d279b7f1bdb027370f17c6c0c4..2e538c4be7dfa9ad622b15735e7a70db788fd5b3 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,6 +562,8 @@ 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,