Merge develop

2019-07-09 21:21:09 +03:00 · 2019-07-09 21:21:09 +03:00 · 371d39e160
commit 371d39e160
parent d2cb18b2a3 670a77ecbc
224 changed files with 2317 additions and 678 deletions
--- 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])
        )