diff options
| author | rinpatch <rinpatch@sdf.org> | 2019-06-21 23:43:14 +0000 |
|---|---|---|
| committer | rinpatch <rinpatch@sdf.org> | 2019-06-21 23:43:14 +0000 |
| commit | cf94b813e5db3e6814d88195ce0688f22d4981a8 (patch) | |
| tree | 977456db656b7cc9ad867488c09502b3e0cf17b3 | |
| parent | 55742d978d15bba75bcae9c6f2d91afbb77d0dc5 (diff) | |
| parent | f4009b6706781f7d6caf75a29cc6e700e7c7e88f (diff) | |
| download | pleroma-cf94b813e5db3e6814d88195ce0688f22d4981a8.tar.gz pleroma-cf94b813e5db3e6814d88195ce0688f22d4981a8.zip | |
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
| -rw-r--r-- | priv/templates/sample_config.eex | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/priv/templates/sample_config.eex b/priv/templates/sample_config.eex index 526593d0a..8cadb995e 100644 --- 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" |