moon
/
spc-pleroma
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

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

This commit is contained in:
Alexander Strizhakov 2020-03-18 14:08:40 +03:00
parent f9ecb513fa b17d8d305f
commit 51ce0813d3
No known key found for this signature in database
GPG Key ID: 022896A53AEF1381
1 changed files with 1 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
config/config.exs
View File

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