Merge branch 'deactivate-gun-again' into 'develop'

Config: Default to Hackney again See merge request !2821

Merge branch 'deactivate-gun-again' into 'develop'
Config: Default to Hackney again See merge request !2821
a1a43f39 · lain · ac0a8dfd · 7bcd2e94 · a1a43f39
Commit a1a43f39 authored Jul 31, 2020 by lain
Hide whitespace changes
Inline Side-by-side

Showing with 1 addition and 1 deletion

config/config.exs config/config.exs +1 -1

No files found.
--- a/config/config.exs
+++ b/config/config.exs
@@ -172,7 +172,7 @@
  "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,