Merge remote-tracking branch 'upstream/develop' into admin-create-users

[akkoma] / lib / pleroma / reverse_proxy.ex

diff --git a/lib/pleroma/reverse_proxy.ex b/lib/pleroma/reverse_proxy.ex
index 6e5feb4c3243ff7cb432546df5933d5ba3bcc3c5..983e156f53237a2120b92ec0d82fd2b412240c4e 100644 (file)
--- a/lib/pleroma/reverse_proxy.ex
+++ b/lib/pleroma/reverse_proxy.ex
@@ -61,7 +61,7 @@ defmodule Pleroma.ReverseProxy do
   * `http`: options for [hackney](https://github.com/benoitc/hackney).
 
   """
-  @hackney Application.get_env(:pleroma, :hackney, :hackney)
+  @hackney Pleroma.Config.get(:hackney, :hackney)
 
   @default_hackney_options []