diff options
| author | lambda <pleromagit@rogerbraun.net> | 2019-01-30 20:18:05 +0000 |
|---|---|---|
| committer | lambda <pleromagit@rogerbraun.net> | 2019-01-30 20:18:05 +0000 |
| commit | 6b54a3ec0bc0fc63db44ce72f8d4fe0f97adc1bc (patch) | |
| tree | d570fd62b3cb526ee17064eed5f750279eb04c1f /lib/pleroma/application.ex | |
| parent | 45d22269e7213fecaa753ed0c767781d7a736d9c (diff) | |
| parent | 5ea0397e2d941a95cda9b3c5d8d66cbec9a6b1d6 (diff) | |
| download | pleroma-6b54a3ec0bc0fc63db44ce72f8d4fe0f97adc1bc.tar.gz | |
Merge branch 'multiple-hackney-pools' into 'develop'
Fix 4aff4efa typos
See merge request pleroma/pleroma!743
Diffstat (limited to 'lib/pleroma/application.ex')
| -rw-r--r-- | lib/pleroma/application.ex | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/lib/pleroma/application.ex b/lib/pleroma/application.ex index f775cd53d..40bff08c7 100644 --- 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 |