Merge branch 'fix_485' into 'develop'

Change 'name' to 'instance_name' so option is used when running non-interactive See merge request pleroma/pleroma!607
2018-12-29 17:30:31 +00:00 · 2018-12-29 17:30:31 +00:00 · f5d7b0003e
parent e8ba390fe9 ab9cda315f
commit f5d7b0003e
1 changed files with 1 additions and 1 deletions
--- a/lib/mix/tasks/pleroma/instance.ex
+++ b/lib/mix/tasks/pleroma/instance.ex
@ -75,7 +75,7 @@ defmodule Mix.Tasks.Pleroma.Instance do
      name =
        Common.get_option(
          options,
-          :name,
+          :instance_name,
          "What is the name of your instance? (e.g. Pleroma/Soykaf)"
        )