Fix merge conflicts with upstream

[akkoma] / config / config.exs

diff --git a/config/config.exs b/config/config.exs
index 2f8a18788cfc0329a01b49951bb304380a9982bb..c00d5dca9d78d5d3a15d6a4e34a444d43ea0b5a4 100644 (file)
--- a/config/config.exs
+++ b/config/config.exs
@@ -321,9 +321,6 @@ config :pleroma, :frontend_configurations,
     subjectLineBehavior: "email",
     theme: "pleroma-dark",
     webPushNotifications: false
-  },
-  masto_fe: %{
-    showInstanceSpecificPanel: true
   }
 
 config :pleroma, :assets,