Skip to content
Snippets Groups Projects
Commit cf94b813 authored by rinpatch's avatar rinpatch
Browse files

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
parents 55742d97 f4009b67
No related branches found
No related tags found
No related merge requests found
......@@ -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"
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment