logo

pleroma

My custom branche(s) on git.pleroma.social/pleroma/pleroma git clone https://hacktivis.me/git/pleroma.git
commit: 4cf03046f5d5080ecfff8677006a03bb7ce84efb
parent 6efbd088546d7b95126b3100bca57b41e9482211
Author: Lain Soykaf <lain@lain.com>
Date:   Sun, 26 Dec 2021 16:57:17 +0100

Merge branch 'finch' of git.pleroma.social:pleroma/pleroma into finch

Diffstat:

Mlib/pleroma/reverse_proxy/client/wrapper.ex1+
1 file changed, 1 insertion(+), 0 deletions(-)

diff --git a/lib/pleroma/reverse_proxy/client/wrapper.ex b/lib/pleroma/reverse_proxy/client/wrapper.ex @@ -25,5 +25,6 @@ defmodule Pleroma.ReverseProxy.Client.Wrapper do defp client(Tesla.Adapter.Hackney), do: Pleroma.ReverseProxy.Client.Hackney defp client(Tesla.Adapter.Gun), do: Pleroma.ReverseProxy.Client.Tesla + defp client({Tesla.Adapter.Finch, _}), do: Pleroma.ReverseProxy.Client.Hackney defp client(_), do: Pleroma.Config.get!(Pleroma.ReverseProxy.Client) end