diff options
| author | rinpatch <rinpatch@sdf.org> | 2020-06-09 18:06:27 +0000 |
|---|---|---|
| committer | rinpatch <rinpatch@sdf.org> | 2020-06-09 18:06:27 +0000 |
| commit | 6c90fc8e70760bf8c58bb731ce294e9eee02f430 (patch) | |
| tree | bd9a1f004b07c434c1ae2a6b3701ffad52d6304a /config | |
| parent | a5ccb5b0b1032b102c54d4df2e17c61423089e73 (diff) | |
| parent | f05f206e13a152ccdae679e84a29633adfbba2b1 (diff) | |
| download | pleroma-6c90fc8e70760bf8c58bb731ce294e9eee02f430.tar.gz pleroma-6c90fc8e70760bf8c58bb731ce294e9eee02f430.zip | |
Merge branch 'release/2.0.6' into 'stable'
Release/2.0.6
See merge request pleroma/pleroma!2632
Diffstat (limited to 'config')
| -rw-r--r-- | config/config.exs | 10 |
1 files changed, 1 insertions, 9 deletions
diff --git a/config/config.exs b/config/config.exs index 3357e23e7..5eb1c7583 100644 --- a/config/config.exs +++ b/config/config.exs @@ -190,15 +190,7 @@ config :tesla, adapter: Tesla.Adapter.Hackney config :pleroma, :http, proxy_url: nil, send_user_agent: true, - user_agent: :default, - adapter: [ - ssl_options: [ - # Workaround for remote server certificate chain issues - partial_chain: &:hackney_connect.partial_chain/1, - # We don't support TLS v1.3 yet - versions: [:tlsv1, :"tlsv1.1", :"tlsv1.2"] - ] - ] + user_agent: :default config :pleroma, :instance, name: "Pleroma", |