diff options
| author | Rin Toshaka <rinpatch@sdf.org> | 2018-12-06 18:11:22 +0100 |
|---|---|---|
| committer | Rin Toshaka <rinpatch@sdf.org> | 2018-12-06 18:11:22 +0100 |
| commit | 88f92693f25c34f8ab82d4ed809b266bf5fb9ff8 (patch) | |
| tree | d6115e451d0cd98672669c6ba93921f75f21e16a /lib/pleroma/reverse_proxy.ex | |
| parent | ca7b46fb3ba576fb7e67eba02654e6df9299392a (diff) | |
| parent | 1d531fd2f32a7f8fff562a3122b30b8ccdccead0 (diff) | |
| download | pleroma-88f92693f25c34f8ab82d4ed809b266bf5fb9ff8.tar.gz | |
Merge develop
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", |