Merge branch 'develop' into issue/1383

This commit is contained in:
Maksim Pechnikov 2019-11-28 21:26:56 +03:00
commit b7c449118b
32 changed files with 510 additions and 211 deletions

View file

@ -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

View file

@ -21,6 +21,7 @@ config :phoenix, serve_endpoints: true
# Do not print debug messages in production
config :logger, :console, level: :warn
config :logger, :ex_syslogger, level: :warn
# ## SSL Support
#