diff options
| author | lain <lain@soykaf.club> | 2020-07-31 09:11:24 +0000 |
|---|---|---|
| committer | lain <lain@soykaf.club> | 2020-07-31 09:11:24 +0000 |
| commit | a1a43f39dc85e673f6e4f395b7ac515356177fdf (patch) | |
| tree | 4c387e350e638be03fe9c387858bb1fd825082fc | |
| parent | ac0a8dfdd46b1823cace7fb798d669e8ca7b5dac (diff) | |
| parent | 7bcd2e948ea5cc59ad0a40e2840be86650f0995e (diff) | |
| download | pleroma-a1a43f39dc85e673f6e4f395b7ac515356177fdf.tar.gz | |
Merge branch 'deactivate-gun-again' into 'develop'
Config: Default to Hackney again
See merge request pleroma/pleroma!2821
| -rw-r--r-- | config/config.exs | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/config/config.exs b/config/config.exs index 857e0afbb..d31208c25 100644 --- a/config/config.exs +++ b/config/config.exs @@ -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, |