diff options
| author | Ivan Tashkinov <ivant.business@gmail.com> | 2019-07-06 10:17:06 +0300 |
|---|---|---|
| committer | Ivan Tashkinov <ivant.business@gmail.com> | 2019-07-06 10:17:06 +0300 |
| commit | ad8d86e7c600bca65e5f0bb407651d33f1e53043 (patch) | |
| tree | 75c395c888a10bad571769eaf828d989c2a5b2c4 /lib/mix/tasks | |
| parent | a7994185739522dee80e22f76e5fdac1a3b8279b (diff) | |
| parent | 3589b30ddc9d0c23ca6f00264cff05e53be1b270 (diff) | |
| download | pleroma-ad8d86e7c600bca65e5f0bb407651d33f1e53043.tar.gz | |
Merge remote-tracking branch 'remotes/upstream/develop' into 161-incoming-replies-depth-limit
Diffstat (limited to 'lib/mix/tasks')
| -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]) ) |