Merge branch 'deactivate-gun-again' into 'develop'

Config: Default to Hackney again

See merge request 
This commit is contained in:
lain 2020-07-31 09:11:24 +00:00
commit a1a43f39dc
1 changed files with 1 additions and 1 deletions

View File

@ -172,7 +172,7 @@
"application/ld+json" => ["activity+json"] "application/ld+json" => ["activity+json"]
} }
config :tesla, adapter: Tesla.Adapter.Gun config :tesla, adapter: Tesla.Adapter.Hackney
# Configures http settings, upstream proxy etc. # Configures http settings, upstream proxy etc.
config :pleroma, :http, config :pleroma, :http,