Merge branch 'gun' of git.pleroma.social:alex.s/pleroma into gun
This commit is contained in:
commit
51ce0813d3
|
@ -170,7 +170,7 @@
|
|||
"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,
|
||||
|
|
Loading…
Reference in a new issue