Merge branch 'default-to-hackney-again' into 'develop'

Config: Default to Hackney again See merge request pleroma/pleroma!2619
2020-06-01 13:24:03 +00:00 · 2020-06-01 13:24:03 +00:00 · fa37bfff99
commit fa37bfff99
parent e96765df6b ac31f687c0
1 changed files with 2 additions and 1 deletions
--- a/config/config.exs
+++ b/config/config.exs
@ -171,7 +171,8 @@
  "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,