diff options
| author | rinpatch <rinpatch@sdf.org> | 2019-01-13 13:38:28 +0300 |
|---|---|---|
| committer | rinpatch <rinpatch@sdf.org> | 2019-01-13 13:38:28 +0300 |
| commit | e4dc3f71aea900e566c0d66ddffc5cd57e3920dd (patch) | |
| tree | d0b0edfd3c7aa4c2015b0b461a4c40895e16eba9 /lib/mix/tasks/pleroma/instance.ex | |
| parent | 9a6236e69d2709c0df374574fd77c4b2bc3d68fb (diff) | |
| parent | 19b6a8239387869c69c6885044ee488d097b723f (diff) | |
| download | pleroma-e4dc3f71aea900e566c0d66ddffc5cd57e3920dd.tar.gz | |
Resolve merge conflict
Diffstat (limited to 'lib/mix/tasks/pleroma/instance.ex')
| -rw-r--r-- | lib/mix/tasks/pleroma/instance.ex | 6 |
1 files changed, 5 insertions, 1 deletions
diff --git a/lib/mix/tasks/pleroma/instance.ex b/lib/mix/tasks/pleroma/instance.ex index 02e1ce27d..0a2c891c0 100644 --- a/lib/mix/tasks/pleroma/instance.ex +++ b/lib/mix/tasks/pleroma/instance.ex @@ -1,3 +1,7 @@ +# Pleroma: A lightweight social networking server +# Copyright © 2017-2018 Pleroma Authors <https://pleroma.social/> +# SPDX-License-Identifier: AGPL-3.0-only + defmodule Mix.Tasks.Pleroma.Instance do use Mix.Task alias Mix.Tasks.Pleroma.Common @@ -71,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)" ) |