diff options
| author | Alex Gleason <alex@alexgleason.me> | 2020-09-11 14:13:38 -0500 |
|---|---|---|
| committer | Alex Gleason <alex@alexgleason.me> | 2020-09-11 14:13:38 -0500 |
| commit | 9733c9d06563a92e4c58ac906c5f98b617b9e731 (patch) | |
| tree | abbf03ddb917c1c203cb79eab64647d3af541fff /lib/pleroma/reverse_proxy | |
| parent | dfb831ca39db3098d6d585448a6ff8e938e51e8c (diff) | |
| parent | 9fb88c814ddadd9138ef29550a856938491a1ca4 (diff) | |
| download | pleroma-9733c9d06563a92e4c58ac906c5f98b617b9e731.tar.gz pleroma-9733c9d06563a92e4c58ac906c5f98b617b9e731.zip | |
Merge remote-tracking branch 'upstream/develop' into chat-moderation
Diffstat (limited to 'lib/pleroma/reverse_proxy')
| -rw-r--r-- | lib/pleroma/reverse_proxy/client/tesla.ex | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/lib/pleroma/reverse_proxy/client/tesla.ex b/lib/pleroma/reverse_proxy/client/tesla.ex index d5a339681..4b118eec2 100644 --- a/lib/pleroma/reverse_proxy/client/tesla.ex +++ b/lib/pleroma/reverse_proxy/client/tesla.ex @@ -28,7 +28,7 @@ defmodule Pleroma.ReverseProxy.Client.Tesla do url, body, headers, - Keyword.put(opts, :adapter, opts) + opts ) do if is_map(response.body) and method != :head do {:ok, response.status, response.headers, response.body} |