From 991b26f494ef0df7679fc73789a16820cb60d5ff Mon Sep 17 00:00:00 2001
From: lain <lain@soykaf.club>
Date: Wed, 1 Dec 2021 15:49:57 +0000
Subject: [PATCH] Merge branch 'update-hackney' into 'develop'

Mix: upgrade Hackney to 1.18.0

Closes #2753

See merge request pleroma/pleroma!3549
---
 mix.exs | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/mix.exs b/mix.exs
index 39c79c83b..6841875d7 100644
--- a/mix.exs
+++ b/mix.exs
@@ -208,7 +208,7 @@ defmodule Pleroma.Mixfile do
       {:mock, "~> 0.3.5", only: :test},
       # temporary downgrade for excoveralls, hackney until hackney max_connections bug will be fixed
       {:excoveralls, "0.12.3", only: :test},
-      {:hackney, "~> 1.17.0", override: true},
+      {:hackney, "~> 1.18.0", override: true},
       {:mox, "~> 1.0", only: :test},
       {:websocket_client, git: "https://github.com/jeremyong/websocket_client.git", only: :test}
     ] ++ oauth_deps()