diff options
| author | marcin mikołajczak <git@mkljczk.pl> | 2021-12-28 16:27:27 +0100 |
|---|---|---|
| committer | marcin mikołajczak <git@mkljczk.pl> | 2021-12-28 16:27:27 +0100 |
| commit | 746c9daa62d591b0559768251889cccb025e7db0 (patch) | |
| tree | 6c95e23bf0c3c3a76dc25e013a7dfccd3d8a98be /lib/pleroma/reverse_proxy | |
| parent | f734579965b6f1a635e0622356e9cf6d4fff00bb (diff) | |
| parent | de7f84deb3ebe57744630950860f8fbf64a414a2 (diff) | |
| download | pleroma-746c9daa62d591b0559768251889cccb025e7db0.tar.gz pleroma-746c9daa62d591b0559768251889cccb025e7db0.zip | |
Merge remote-tracking branch 'pleroma/develop' into mastodon-lookup
Signed-off-by: marcin mikołajczak <git@mkljczk.pl>
Diffstat (limited to 'lib/pleroma/reverse_proxy')
| -rw-r--r-- | lib/pleroma/reverse_proxy/client/wrapper.ex | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/lib/pleroma/reverse_proxy/client/wrapper.ex b/lib/pleroma/reverse_proxy/client/wrapper.ex index 06dd29fea..ce144559f 100644 --- 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 |