diff options
| author | lain <lain@soykaf.club> | 2020-06-01 13:24:03 +0000 |
|---|---|---|
| committer | lain <lain@soykaf.club> | 2020-06-01 13:24:03 +0000 |
| commit | fa37bfff99b3d4277a14345cff4ccbbe93385e04 (patch) | |
| tree | 36737eb6e5697863cf9aef305c38e61a3b2f5898 | |
| parent | e96765df6b04fe5e9766271a9c62e559392758b2 (diff) | |
| parent | ac31f687c0fbe06251257acb72b67146b472d22f (diff) | |
| download | pleroma-fa37bfff99b3d4277a14345cff4ccbbe93385e04.tar.gz pleroma-fa37bfff99b3d4277a14345cff4ccbbe93385e04.zip | |
Merge branch 'default-to-hackney-again' into 'develop'
Config: Default to Hackney again
See merge request pleroma/pleroma!2619
| -rw-r--r-- | config/config.exs | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/config/config.exs b/config/config.exs index d15998715..9a9fbb436 100644 --- a/config/config.exs +++ b/config/config.exs @@ -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, |