Merge branch 'deactivate-gun-again' into 'develop'
Config: Default to Hackney again See merge request pleroma/pleroma!2821
This commit is contained in:
commit
a1a43f39dc
|
@ -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,
|
||||||
|
|
Loading…
Reference in New Issue