commit: fa37bfff99b3d4277a14345cff4ccbbe93385e04
parent e96765df6b04fe5e9766271a9c62e559392758b2
Author: lain <lain@soykaf.club>
Date: Mon, 1 Jun 2020 13:24:03 +0000
Merge branch 'default-to-hackney-again' into 'develop'
Config: Default to Hackney again
See merge request pleroma/pleroma!2619
Diffstat:
1 file changed, 2 insertions(+), 1 deletion(-)
diff --git a/config/config.exs b/config/config.exs
@@ -171,7 +171,8 @@ config :mime, :types, %{
"application/ld+json" => ["activity+json"]
}
-config :tesla, adapter: Tesla.Adapter.Gun
+config :tesla, adapter: Tesla.Adapter.Hackney
+
# Configures http settings, upstream proxy etc.
config :pleroma, :http,
proxy_url: nil,