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 828fe00857518594c69495ae44f705c9debd8b71..005388c42ea6aa0d6cbb66d48134da73fa218fd1 100644 (file)
--- a/config/config.exs
+++ b/config/config.exs
@@ -221,6 +221,7 @@ config :pleroma, :instance,
     "text/markdown",
     "text/bbcode"
   ],
+  staff_transparency: [],
   autofollowed_nicknames: [],
   autofollowing_nicknames: [],
   max_pinned_statuses: 1,
@@ -321,9 +322,6 @@ config :pleroma, :frontend_configurations,
     subjectLineBehavior: "email",
     theme: "pleroma-dark",
     webPushNotifications: false
-  },
-  masto_fe: %{
-    showInstanceSpecificPanel: true
   }
 
 config :pleroma, :assets,