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

This commit is contained in:
Lain Soykaf 2021-12-26 16:57:17 +01:00
commit 4cf03046f5

View file

@ -25,5 +25,6 @@ defmodule Pleroma.ReverseProxy.Client.Wrapper do
defp client(Tesla.Adapter.Hackney), do: Pleroma.ReverseProxy.Client.Hackney defp client(Tesla.Adapter.Hackney), do: Pleroma.ReverseProxy.Client.Hackney
defp client(Tesla.Adapter.Gun), do: Pleroma.ReverseProxy.Client.Tesla 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) defp client(_), do: Pleroma.Config.get!(Pleroma.ReverseProxy.Client)
end end