Commit a1a43f39 authored by lain's avatar lain

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

Config: Default to Hackney again

See merge request pleroma/pleroma!2821
parents ac0a8dfd 7bcd2e94
Pipeline #29259 failed with stages
in 17 minutes and 41 seconds
...@@ -172,7 +172,7 @@ ...@@ -172,7 +172,7 @@
"application/ld+json" => ["activity+json"] "application/ld+json" => ["activity+json"]
} }
config :tesla, adapter: Tesla.Adapter.Gun config :tesla, adapter: Tesla.Adapter.Hackney
# Configures http settings, upstream proxy etc. # Configures http settings, upstream proxy etc.
config :pleroma, :http, config :pleroma, :http,
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment