diff options
| author | kaniini <nenolod@gmail.com> | 2018-12-06 15:57:56 +0000 |
|---|---|---|
| committer | kaniini <nenolod@gmail.com> | 2018-12-06 15:57:56 +0000 |
| commit | abead01ab6f5586e60d467d7efd0de560a97c5bd (patch) | |
| tree | 8991de62733d2fed65ca271b420c5f35d2f7adcc /lib/pleroma/reverse_proxy.ex | |
| parent | b0adea30b38713e70039475acdd3defbef57171a (diff) | |
| parent | a09ed0f5afe6336763b47edab0c0d9a629a74ad0 (diff) | |
| download | pleroma-abead01ab6f5586e60d467d7efd0de560a97c5bd.tar.gz | |
Merge branch 'correct-and-improve-http-options' into 'develop'
Correct and improve http options
See merge request pleroma/pleroma!505
Diffstat (limited to 'lib/pleroma/reverse_proxy.ex')
| -rw-r--r-- | lib/pleroma/reverse_proxy.ex | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/lib/pleroma/reverse_proxy.ex b/lib/pleroma/reverse_proxy.ex index ad9dc82fe..4ca84152a 100644 --- a/lib/pleroma/reverse_proxy.ex +++ b/lib/pleroma/reverse_proxy.ex @@ -56,7 +56,7 @@ defmodule Pleroma.ReverseProxy do @hackney Application.get_env(:pleroma, :hackney, :hackney) @httpoison Application.get_env(:pleroma, :httpoison, HTTPoison) - @default_hackney_options [{:follow_redirect, true}] + @default_hackney_options [] @inline_content_types [ "image/gif", |