Merge branch 'develop' into issue/1383
This commit is contained in:
commit
b7c449118b
32 changed files with 510 additions and 211 deletions
|
|
@ -195,6 +195,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
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue