logo

pleroma

My custom branche(s) on git.pleroma.social/pleroma/pleroma
commit: 3589b30ddc9d0c23ca6f00264cff05e53be1b270
parent: c1c00914415099a782bfc064dafd474394f5f201
Author: rinpatch <rinpatch@sdf.org>
Date:   Fri,  5 Jul 2019 18:55:27 +0000

Merge branch 'fix/1058-uploads-dir-consistency' into 'develop'

tasks/pleroma/instance.ex: Change :upload_dir to :uploads_dir

Closes #1058

See merge request pleroma/pleroma!1378

Diffstat:

Mlib/mix/tasks/pleroma/instance.ex2+-
1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/lib/mix/tasks/pleroma/instance.ex b/lib/mix/tasks/pleroma/instance.ex @@ -149,7 +149,7 @@ defmodule Mix.Tasks.Pleroma.Instance do uploads_dir = get_option( options, - :upload_dir, + :uploads_dir, "What directory should media uploads go in (when using the local uploader)?", Pleroma.Config.get([Pleroma.Uploaders.Local, :uploads]) )