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

diff --cc mix.exs
index 581b07f673e17d22fe53b64a1db005b4ee7682ca,615f1d50b87ae4f8876b9986b7791347cf844ae0..360d499050ab28766a1ae676079c400b6b44486d
--- 1/mix.exs
--- 2/mix.exs
+++ b/mix.exs
@@@ -193,9 -192,13 +193,11 @@@ defmodule Pleroma.Mixfile d
         git: "https://git.pleroma.social/pleroma/elixir-libraries/elixir-captcha.git",
         ref: "e0f16822d578866e186a0974d65ad58cddc1e2ab"},
        {:restarter, path: "./restarter"},
 -      {:majic,
 -       git: "https://git.pleroma.social/pleroma/elixir-libraries/majic.git",
 -       ref: "289cda1b6d0d70ccb2ba508a2b0bd24638db2880"},
 +      {:majic, "~> 1.0"},
        {:eblurhash, "~> 1.1.0"},
        {:open_api_spex, "~> 3.10"},
+       {:phoenix_live_dashboard, "~> 0.6.2"},
+       {:ecto_psql_extras, "~> 0.6"},
  
        # indirect dependency version override
        {:plug, "~> 1.10.4", override: true},

diff --cc mix.lock
Simple merge