diff options
author | Haelwenn <contact+git.pleroma.social@hacktivis.me> | 2018-12-29 17:30:31 +0000 |
---|---|---|
committer | Haelwenn <contact+git.pleroma.social@hacktivis.me> | 2018-12-29 17:30:31 +0000 |
commit | f5d7b0003ea200d13abca2cbd4e4f59db9658231 (patch) | |
tree | c83549d9d158ae125bbf84188bafbb15f085b2e2 | |
parent | e8ba390fe9fdd033c2d373b9272cd25cbc032365 (diff) | |
parent | ab9cda315f2ee7b0a2a6e505eface5d7c65d50b4 (diff) | |
download | pleroma-f5d7b0003ea200d13abca2cbd4e4f59db9658231.tar.gz pleroma-f5d7b0003ea200d13abca2cbd4e4f59db9658231.zip |
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
-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 1ef40671c..0a2c891c0 100644 --- 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)" ) |