diff options
| author | lambda <pleromagit@rogerbraun.net> | 2018-12-10 18:33:36 +0000 |
|---|---|---|
| committer | lambda <pleromagit@rogerbraun.net> | 2018-12-10 18:33:36 +0000 |
| commit | bda25b999b5176c73380bff9a1ce6be51cba4820 (patch) | |
| tree | b37c841539f8544848fee2124572a0abe9a47953 /lib/mix/tasks/pleroma/instance.ex | |
| parent | 993c8c8bd4e94985c647f4f9e927cbaa7148e6a0 (diff) | |
| parent | ab98c92d86f91b0c83f482e002e4a518b93f65ca (diff) | |
| download | pleroma-bda25b999b5176c73380bff9a1ce6be51cba4820.tar.gz | |
Merge branch 'develop' into 'fix/mix-task-uploads-moduledoc'
# Conflicts:
# lib/mix/tasks/pleroma/uploads.ex
Diffstat (limited to 'lib/mix/tasks/pleroma/instance.ex')
| -rw-r--r-- | lib/mix/tasks/pleroma/instance.ex | 1 |
1 files changed, 0 insertions, 1 deletions
diff --git a/lib/mix/tasks/pleroma/instance.ex b/lib/mix/tasks/pleroma/instance.ex index c66322707..3be856115 100644 --- a/lib/mix/tasks/pleroma/instance.ex +++ b/lib/mix/tasks/pleroma/instance.ex @@ -1,6 +1,5 @@ defmodule Mix.Tasks.Pleroma.Instance do use Mix.Task - alias Pleroma.{Repo, User} alias Mix.Tasks.Pleroma.Common @shortdoc "Manages Pleroma instance" |