Merge branch 'gun' of git.pleroma.social:alex.s/pleroma into gun

2020-03-18 14:08:40 +03:00 · 2020-03-18 14:08:40 +03:00 · 51ce0813d3
--- 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,