Merge branch 'develop' into issue/1383

2020-01-13 12:41:07 +03:00 · 2020-01-13 12:41:07 +03:00 · b7908844f2
commit b7908844f2
parent 54c9db38c8 a431e8c9f7
173 changed files with 2056 additions and 3546 deletions
--- a/mix.exs
+++ b/mix.exs
@ -164,7 +164,7 @@ defmodule Pleroma.Mixfile do
       ref: "825dc00aaba5a1b7c4202a532b696b595dd3bcb3"},
      {:captcha,
       git: "https://git.pleroma.social/pleroma/elixir-libraries/elixir-captcha.git",
-       ref: "c3c795c55f6b49d79d6ac70a0f91e525099fc3e2"},
+       ref: "e0f16822d578866e186a0974d65ad58cddc1e2ab"},
      {:mox, "~> 0.5", only: :test}
    ] ++ oauth_deps()
  end