diff options
| author | Ivan Tashkinov <ivantashkinov@gmail.com> | 2020-04-13 09:23:50 +0300 |
|---|---|---|
| committer | Ivan Tashkinov <ivantashkinov@gmail.com> | 2020-04-13 09:23:50 +0300 |
| commit | f00ff20768cbbb6eb5a6442772335dbe60fde6d4 (patch) | |
| tree | 934dba7fb5aa850a3a35b229bd7c6020ca3b2816 /lib/mix | |
| parent | c556efb761a3e7fc2beb4540d6f58dbfe8e4abfe (diff) | |
| parent | 7ee35eb9a6a55ef610eb02a04a33f67e5921cff3 (diff) | |
| download | pleroma-f00ff20768cbbb6eb5a6442772335dbe60fde6d4.tar.gz pleroma-f00ff20768cbbb6eb5a6442772335dbe60fde6d4.zip | |
Merge remote-tracking branch 'remotes/origin/develop' into 1364-no-pushes-from-blocked-domains-users
# Conflicts:
# lib/pleroma/following_relationship.ex
Diffstat (limited to 'lib/mix')
| -rw-r--r-- | lib/mix/pleroma.ex | 1 |
1 files changed, 0 insertions, 1 deletions
diff --git a/lib/mix/pleroma.ex b/lib/mix/pleroma.ex index 4dfcc32e7..3ad6edbfb 100644 --- a/lib/mix/pleroma.ex +++ b/lib/mix/pleroma.ex @@ -5,7 +5,6 @@ defmodule Mix.Pleroma do @doc "Common functions to be reused in mix tasks" def start_pleroma do - Mix.Task.run("app.start") Application.put_env(:phoenix, :serve_endpoints, false, persistent: true) if Pleroma.Config.get(:env) != :test do |