From: Lain Soykaf <lain@lain.com>
Date: Sun, 26 Dec 2021 15:41:17 +0000 (+0100)
Subject: Merge branch 'develop' of git.pleroma.social:pleroma/pleroma into finch
X-Git-Url: https://git.squeep.com/?a=commitdiff_plain;h=6efbd088546d7b95126b3100bca57b41e9482211;p=akkoma

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

6efbd088546d7b95126b3100bca57b41e9482211
diff --cc mix.exs
index 581b07f67,615f1d50b..360d49905
--- a/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},