From: FloatingGhost <hannah@coffee-and-dreams.uk>
Date: Fri, 14 Apr 2023 16:56:56 +0000 (+0100)
Subject: Merge branch 'develop' of akkoma.dev:AkkomaGang/akkoma into develop
X-Git-Url: http://git.squeep.com/?a=commitdiff_plain;h=f2b4e7f86be22e755474a03c76f7644092929a70;hp=-c;p=akkoma

Merge branch 'develop' of akkoma.dev:AkkomaGang/akkoma into develop
---

f2b4e7f86be22e755474a03c76f7644092929a70
diff --combined CHANGELOG.md
index a277ac08c,74182aa62..7f481aad5
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@@ -10,8 -10,6 +10,8 @@@ The format is based on [Keep a Changelo
  - Nodeinfo keys for unauthenticated timeline visibility
  - Option to disable federated timeline
  - Option to make the bubble timeline publicly accessible
 +- Ability to swap between installed standard frontends
 +  - *mastodon frontends are still not counted as standard frontends due to the complexity in serving them correctly*. 
  
  ## 2023.03
  
@@@ -28,6 -26,7 +28,7 @@@
  
  ### Removed
  - Possibility of using the `style` parameter on `span` elements. This will break certain MFM parameters.
+ - Option for "default" image description.
  
  ## 2023.02
  
diff --combined config/config.exs
index c1e051148,3fefe8846..95c576385
--- a/config/config.exs
+++ b/config/config.exs
@@@ -65,7 -65,6 +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,9 -745,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",