Merge branch 'develop' into 'move-poison'

# Conflicts:
#   mix.exs

1 files changed, 4 insertions, 3 deletions

diff --git a/mix.exs b/mix.exs
index 267070c81..eab77d9cd 100644
--- a/mix.exs
+++ b/mix.exs
@@ -80,7 +80,8 @@ defmodule Pleroma.Mixfile do
           :comeonin,
           :fast_sanitize,
           :os_mon,
-          :ssl
+          :ssl,
+          :eldap
         ] ++ logger_application(),
       included_applications: [:ex_syslogger]
     ]
@@ -151,7 +152,7 @@ defmodule Pleroma.Mixfile do
       {:html_entities, "~> 0.5", override: true},
       {:calendar, "~> 1.0"},
       {:cachex, "~> 3.2"},
-      {:tesla, "~> 1.8.0"},
+      {:tesla, "~> 1.11"},
       {:castore, "~> 0.1"},
       {:cowlib, "~> 2.9", override: true},
       {:gun, "~> 2.0.0-rc.1", override: true},
@@ -189,7 +190,7 @@ defmodule Pleroma.Mixfile do
        ref: "b647d0deecaa3acb140854fe4bda5b7e1dc6d1c8"},
       {:captcha,
        git: "https://git.pleroma.social/pleroma/elixir-libraries/elixir-captcha.git",
-       ref: "90f6ce7672f70f56708792a98d98bd05176c9176"},
+       ref: "6630c42aaaab124e697b4e513190c89d8b64e410"},
       {:restarter, path: "./restarter"},
       {:majic, "~> 1.0"},
       {:open_api_spex, "~> 3.16"},