diff options
| author | Alexander Strizhakov <alex.strizhakov@gmail.com> | 2020-03-18 14:08:40 +0300 |
|---|---|---|
| committer | Alexander Strizhakov <alex.strizhakov@gmail.com> | 2020-03-18 14:08:40 +0300 |
| commit | 51ce0813d351cad900966aea49a6f6d17d33f964 (patch) | |
| tree | 838f7be440358090f2eea5bbd6f8cdeac972c7ac | |
| parent | f9ecb513faec53758371f6d6efd78668997a1d15 (diff) | |
| parent | b17d8d305f5e9bf25644fd9b3457a965e3a5c001 (diff) | |
| download | pleroma-51ce0813d351cad900966aea49a6f6d17d33f964.tar.gz | |
Merge branch 'gun' of git.pleroma.social:alex.s/pleroma into gun
| -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 3ec1868b2..154eda48a 100644 --- a/config/config.exs +++ b/config/config.exs @@ -170,7 +170,7 @@ config :mime, :types, %{ "application/ld+json" => ["activity+json"] } -config :tesla, adapter: Tesla.Adapter.Hackney +config :tesla, adapter: Tesla.Adapter.Gun # Configures http settings, upstream proxy etc. config :pleroma, :http, proxy_url: nil, |