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

[akkoma] / config / config.exs

diff --git a/config/config.exs b/config/config.exs
index ccfba065ea37415a36c46dde047da36cb8735e90..e7d1014bb6f5300c17b6dd34e82b0e2f364f8605 100644 (file)
--- a/config/config.exs
+++ b/config/config.exs
@@ -221,8 +221,6 @@ config :pleroma, :instance,
     "text/markdown",
     "text/bbcode"
   ],
-  mrf_transparency: true,
-  mrf_transparency_exclusions: [],
   staff_transparency: [],
   autofollowed_nicknames: [],
   autofollowing_nicknames: [],
@@ -324,9 +322,6 @@ config :pleroma, :frontend_configurations,
     subjectLineBehavior: "email",
     theme: "pleroma-dark",
     webPushNotifications: false
-  },
-  masto_fe: %{
-    showInstanceSpecificPanel: true
   }
 
 config :pleroma, :assets,
@@ -355,6 +350,7 @@ config :pleroma, :manifest,
 config :pleroma, :activitypub,
   unfollow_blocked: true,
   outgoing_blocks: true,
+  blockers_visible: true,
   follow_handshake_timeout: 500,
   note_replies_output_limit: 5,
   sign_object_fetches: true,