diff options
| author | Sean King <seanking2919@protonmail.com> | 2021-12-29 18:08:50 -0700 |
|---|---|---|
| committer | Sean King <seanking2919@protonmail.com> | 2021-12-29 18:08:50 -0700 |
| commit | ffeae7ef2c682dfadc01b4fae01807ad0f026fd4 (patch) | |
| tree | 35183398384c21975d16264cc43b8efddbe10710 /lib/pleroma/reverse_proxy | |
| parent | 8ef1d8b566147922c93528b0b60d00fb9e63686b (diff) | |
| parent | 84420d9439bf2bc161507a19778da00b5d990d70 (diff) | |
| download | pleroma-ffeae7ef2c682dfadc01b4fae01807ad0f026fd4.tar.gz pleroma-ffeae7ef2c682dfadc01b4fae01807ad0f026fd4.zip | |
Fix merge conflict in CHANGELOG.md
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 |