Merge branch 'develop' into stable

[akkoma] / config / config.exs

diff --git a/config/config.exs b/config/config.exs
index e216caf9d2c9913aa2c20be6785d594117971c01..95c576385044e78bedc679d25edfad40a5771767 100644 (file)
--- a/config/config.exs
+++ b/config/config.exs
@@ -65,7 +65,6 @@ config :pleroma, Pleroma.Upload,
   link_name: false,
   proxy_remote: false,
   filename_display_max_length: 30,
-  default_description: nil,
   base_url: nil
 
 config :pleroma, Pleroma.Uploaders.Local, uploads: "uploads"
@@ -746,6 +745,9 @@ config :pleroma, :frontends,
   primary: %{"name" => "pleroma-fe", "ref" => "stable"},
   admin: %{"name" => "admin-fe", "ref" => "stable"},
   mastodon: %{"name" => "mastodon-fe", "ref" => "akkoma"},
+  pickable: [
+    "pleroma-fe/stable"
+  ],
   swagger: %{
     "name" => "swagger-ui",
     "ref" => "stable",