aboutsummaryrefslogtreecommitdiff
path: root/lib/pleroma/application.ex
diff options
context:
space:
mode:
authorkaniini <nenolod@gmail.com>2019-06-07 10:58:09 +0000
committerkaniini <nenolod@gmail.com>2019-06-07 10:58:09 +0000
commitd5330ed12561377e5c464bcc2774ebc692b9ac07 (patch)
treeb7392cfcd40fa369875a687d360557be2727318e /lib/pleroma/application.ex
parentcb89987ca1c473e837005191ea23a9bdf45fa3bf (diff)
parent92213fb87c7996caf9d1188a94907d2231ba25c8 (diff)
downloadpleroma-d5330ed12561377e5c464bcc2774ebc692b9ac07.tar.gz
Merge branch 'fix/replace-mix-env' into 'develop'
Replace Mix.env with Pleroma.Config.get(:env) See merge request pleroma/pleroma!1254
Diffstat (limited to 'lib/pleroma/application.ex')
-rw-r--r--lib/pleroma/application.ex2
1 files changed, 1 insertions, 1 deletions
diff --git a/lib/pleroma/application.ex b/lib/pleroma/application.ex
index 69a8a5761..5627d20af 100644
--- a/lib/pleroma/application.ex
+++ b/lib/pleroma/application.ex
@@ -194,7 +194,7 @@ defmodule Pleroma.Application do
end
end
- if Mix.env() == :test do
+ if Pleroma.Config.get(:env) == :test do
defp streamer_child, do: []
defp chat_child, do: []
else