Merge branch 'develop' of git.pleroma.social:pleroma/pleroma into remake-remodel-dms

[akkoma] / config / config.exs

diff --git a/config/config.exs b/config/config.exs
index 232a91bf132c8063f8f0f730121bb68eade6ad6f..f44837e24efe38ec3dfc8b234f1e1bb5fa636309 100644 (file)
--- a/config/config.exs
+++ b/config/config.exs
@@ -240,6 +240,8 @@ config :pleroma, :instance,
   extended_nickname_format: true,
   cleanup_attachments: false
 
+config :pleroma, :extensions, output_relationships_in_statuses_by_default: true
+
 config :pleroma, :feed,
   post_title: %{
     max_length: 100,
@@ -559,6 +561,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,