Merge branch 'revert-4d3655c4' into 'develop'

[akkoma] / lib / pleroma / application.ex

diff --git a/lib/pleroma/application.ex b/lib/pleroma/application.ex
index f775cd53dca89d97580ec78bd275d96e5d4c1747..40bff08c722dbccdbd0fac96c76f608ec8311cbe 100644 (file)
--- a/lib/pleroma/application.ex
+++ b/lib/pleroma/application.ex
@@ -132,7 +132,7 @@ defmodule Pleroma.Application do
         []
       end ++
       if Pleroma.Config.get([Pleroma.Uploader, :proxy_remote]) do
-        [:uploadproxy]
+        [:upload]
       else
         []
       end