logo

pleroma

My custom branche(s) on git.pleroma.social/pleroma/pleroma git clone https://hacktivis.me/git/pleroma.git
commit: a1a43f39dc85e673f6e4f395b7ac515356177fdf
parent ac0a8dfdd46b1823cace7fb798d669e8ca7b5dac
Author: lain <lain@soykaf.club>
Date:   Fri, 31 Jul 2020 09:11:24 +0000

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

Config: Default to Hackney again

See merge request pleroma/pleroma!2821

Diffstat:

Mconfig/config.exs2+-
1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/config/config.exs b/config/config.exs @@ -172,7 +172,7 @@ config :mime, :types, %{ "application/ld+json" => ["activity+json"] } -config :tesla, adapter: Tesla.Adapter.Gun +config :tesla, adapter: Tesla.Adapter.Hackney # Configures http settings, upstream proxy etc. config :pleroma, :http,