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

Config: Default to Hackney again

See merge request pleroma/pleroma!2821
This commit is contained in:
lain 2020-07-31 09:11:24 +00:00
commit a1a43f39dc

View file

@ -172,7 +172,7 @@ 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,