logo

pleroma

My custom branche(s) on git.pleroma.social/pleroma/pleroma
commit: f5d7b0003ea200d13abca2cbd4e4f59db9658231
parent: e8ba390fe9fdd033c2d373b9272cd25cbc032365
Author: Haelwenn <contact+git.pleroma.social@hacktivis.me>
Date:   Sat, 29 Dec 2018 17:30:31 +0000

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

Diffstat:

Mlib/mix/tasks/pleroma/instance.ex2+-
1 file changed, 1 insertion(+), 1 deletion(-)

diff --git 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)" )