diff options
| author | rinpatch <rinpatch@sdf.org> | 2019-07-05 18:55:27 +0000 |
|---|---|---|
| committer | rinpatch <rinpatch@sdf.org> | 2019-07-05 18:55:27 +0000 |
| commit | 3589b30ddc9d0c23ca6f00264cff05e53be1b270 (patch) | |
| tree | cb18b20348c32db9ce0b6a233fd37180bfc37328 /lib | |
| parent | c1c00914415099a782bfc064dafd474394f5f201 (diff) | |
| parent | 977c2d044810d71fa89f9976ef342b6f708a027a (diff) | |
| download | pleroma-3589b30ddc9d0c23ca6f00264cff05e53be1b270.tar.gz | |
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 (limited to 'lib')
| -rw-r--r-- | lib/mix/tasks/pleroma/instance.ex | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/lib/mix/tasks/pleroma/instance.ex b/lib/mix/tasks/pleroma/instance.ex index a27c4b897..2ae16adc0 100644 --- 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]) ) |