mirror of
https://git.pleroma.social/sjw/pleroma.git
synced 2024-12-23 01:46:16 +01:00
Merge branch 'default-to-hackney-again' into 'develop'
Config: Default to Hackney again See merge request pleroma/pleroma!2619
This commit is contained in:
commit
fa37bfff99
@ -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,
|
||||
|
Loading…
Reference in New Issue
Block a user