Merge branch 'develop' into issue/1383

2019-12-14 21:44:10 +03:00 · 2019-12-14 21:44:10 +03:00 · 67cb46e15d
commit 67cb46e15d
parent 2b821036c4 8efacfed67
80 changed files with 1278 additions and 1292 deletions
--- a/mix.exs
+++ b/mix.exs
@ -162,6 +162,9 @@ defmodule Pleroma.Mixfile do
      {:remote_ip,
       git: "https://git.pleroma.social/pleroma/remote_ip.git",
       ref: "825dc00aaba5a1b7c4202a532b696b595dd3bcb3"},
+      {:captcha,
+       git: "https://git.pleroma.social/pleroma/elixir-libraries/elixir-captcha.git",
+       ref: "c3c795c55f6b49d79d6ac70a0f91e525099fc3e2"},
      {:mox, "~> 0.5", only: :test}
    ] ++ oauth_deps()
  end