diff options
| author | rinpatch <rinpatch@sdf.org> | 2019-06-22 12:44:20 +0300 |
|---|---|---|
| committer | rinpatch <rinpatch@sdf.org> | 2019-06-22 12:44:20 +0300 |
| commit | 51760c84b91f0af75200d2505f6b52ec1a4af484 (patch) | |
| tree | 738ff5876fd4c63d2613540e08003354b0055443 /priv | |
| parent | 177faf15c24453fc67bb5bedc6189055e686e2a3 (diff) | |
| parent | 8dbcff2fed0bf6fb20b70388974fcbe9d3a0aeee (diff) | |
| download | pleroma-51760c84b91f0af75200d2505f6b52ec1a4af484.tar.gz pleroma-51760c84b91f0af75200d2505f6b52ec1a4af484.zip | |
Merge branch 'develop' into release-docs
Diffstat (limited to 'priv')
| -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" |