diff options
| author | Alex Gleason <alex@alexgleason.me> | 2020-07-16 14:51:36 -0500 |
|---|---|---|
| committer | Alex Gleason <alex@alexgleason.me> | 2020-07-16 14:51:36 -0500 |
| commit | 38425ebdbf157377ccb0402f78dc3d02f81c55f5 (patch) | |
| tree | 740f32837d28e918f097c948d89827d99434d5b2 /lib/mix/tasks/pleroma/instance.ex | |
| parent | 8daacc911498d827fd68ea3d34eb1be9ae4a1ffe (diff) | |
| parent | 3a2b2cb6f2d6ce39ae0d246649189c021c535992 (diff) | |
| download | pleroma-38425ebdbf157377ccb0402f78dc3d02f81c55f5.tar.gz | |
Merge remote-tracking branch 'upstream/develop' into linkify
Diffstat (limited to 'lib/mix/tasks/pleroma/instance.ex')
| -rw-r--r-- | lib/mix/tasks/pleroma/instance.ex | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/lib/mix/tasks/pleroma/instance.ex b/lib/mix/tasks/pleroma/instance.ex index 86409738a..91440b453 100644 --- a/lib/mix/tasks/pleroma/instance.ex +++ b/lib/mix/tasks/pleroma/instance.ex @@ -145,7 +145,7 @@ defmodule Mix.Tasks.Pleroma.Instance do options, :uploads_dir, "What directory should media uploads go in (when using the local uploader)?", - Pleroma.Config.get([Pleroma.Uploaders.Local, :uploads]) + Config.get([Pleroma.Uploaders.Local, :uploads]) ) |> Path.expand() @@ -154,7 +154,7 @@ defmodule Mix.Tasks.Pleroma.Instance do options, :static_dir, "What directory should custom public files be read from (custom emojis, frontend bundle overrides, robots.txt, etc.)?", - Pleroma.Config.get([:instance, :static_dir]) + Config.get([:instance, :static_dir]) ) |> Path.expand() |