Merge remote-tracking branch 'origin/develop' into issue-3314-remote-ip-hex

# Conflicts: # mix.exs
2026-05-14 09:27:18 +04:00 · 2026-05-14 09:27:18 +04:00 · 512b0f67a4
commit 512b0f67a4
parent c92d233233 e4ad3ab322
3 changed files with 3 additions and 4 deletions
--- a/mix.exs
+++ b/mix.exs
@ -184,9 +184,7 @@ defmodule Pleroma.Mixfile do
      {:concurrent_limiter, "~> 0.1.1"},
      {:remote_ip, "~> 1.2.0"},
      {:inet_cidr, "~> 1.0"},
-      {:captcha,
-       git: "https://git.pleroma.social/pleroma/elixir-libraries/elixir-captcha.git",
-       ref: "e7b7cc34cc16b383461b966484c297e4ec9aeef6"},
+      {:captcha, "~> 1.0.3", hex: :pleroma_captcha},
      {:restarter, path: "./restarter"},
      {:majic, "~> 1.2"},
      {:open_api_spex, "~> 3.22"},