pleroma

commit: cf94b813e5db3e6814d88195ce0688f22d4981a8
parent: 55742d978d15bba75bcae9c6f2d91afbb77d0dc5
Author: rinpatch <rinpatch@sdf.org>
Date:   Fri, 21 Jun 2019 23:43:14 +0000

Merge branch 'fix/fallback-config' into 'develop'

Fallback to Config if Mix.Config does not exist, even if Config does not exist either

See merge request pleroma/pleroma!1320
Diffstat:
M
priv/templates/sample_config.eex
2
+-

1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/priv/templates/sample_config.eex b/priv/templates/sample_config.eex
@@ -3,7 +3,7 @@
 # NOTE: This file should not be committed to a repo or otherwise made public
 # without removing sensitive information.
 
-<%= if Code.ensure_loaded?(Config) do
+<%= if Code.ensure_loaded?(Config) or not Code.ensure_loaded?(Mix.Config) do
   "import Config"
 else
   "use Mix.Config"