diff options
| author | Alexander Strizhakov <alex.strizhakov@gmail.com> | 2020-01-17 11:54:22 +0300 |
|---|---|---|
| committer | Alexander Strizhakov <alex.strizhakov@gmail.com> | 2020-01-17 11:54:22 +0300 |
| commit | 58e8963824bd3375ec1fa04b265187a888aaa5ea (patch) | |
| tree | 1763a5699a4af4f955cd0599c5afbec3e5102f38 | |
| parent | 60ba2339a244290f7353e8026032b1a5d185227c (diff) | |
| download | pleroma-58e8963824bd3375ec1fa04b265187a888aaa5ea.tar.gz | |
fix for config loader
| -rw-r--r-- | lib/pleroma/config/holder.ex | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/lib/pleroma/config/holder.ex b/lib/pleroma/config/holder.ex index aa35382b2..c8badc52c 100644 --- a/lib/pleroma/config/holder.ex +++ b/lib/pleroma/config/holder.ex @@ -12,8 +12,8 @@ defmodule Pleroma.Config.Loader do # support for Elixir less than 1.9 @spec load() :: map() def load do - config = Mix.Config.eval!("config/config.exs") - env_config = Mix.Config.eval!("config/#{Mix.env()}.exs") + {config, _paths} = Mix.Config.eval!("config/config.exs") + {env_config, _paths} = Mix.Config.eval!("config/#{Mix.env()}.exs") Mix.Config.merge(config, env_config) end |