Merge branch 'develop' into 'phoenix1.7'

# Conflicts: # mix.exs
2023-06-02 15:41:40 +00:00 · 2023-06-02 15:41:40 +00:00 · 86b38dd14b
commit 86b38dd14b
parent 2e45be2653 e8d3525665
12 changed files with 6 additions and 30 deletions
--- a/mix.exs
+++ b/mix.exs
@ -129,10 +129,7 @@ defmodule Pleroma.Mixfile do
      {:plug_cowboy, "~> 2.5"},
      # oban 2.14 requires Elixir 1.12+
      {:oban, "~> 2.13.4"},
-      {:gettext,
-       git: "https://github.com/tusooa/gettext.git",
-       ref: "72fb2496b6c5280ed911bdc3756890e7f38a4808",
-       override: true},
+      {:gettext, "~> 0.20"},
      {:bcrypt_elixir, "~> 2.2"},
      {:trailing_format_plug, "~> 0.0.7"},
      {:fast_sanitize, "~> 0.2.0"},