Merge branch 'media-proxy-follow-redirect' into 'develop'

[akkoma] / lib / pleroma / reverse_proxy.ex

diff --git a/lib/pleroma/reverse_proxy.ex b/lib/pleroma/reverse_proxy.ex
index ad9dc82fe02a653bd9fd3a1272b509b4a5b430d2..4ca84152aa6abd786cb28d13d14a14fec8a15fc1 100644 (file)
--- 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",