diff options
| author | rinpatch <rinpatch@sdf.org> | 2020-03-11 15:16:18 +0000 |
|---|---|---|
| committer | rinpatch <rinpatch@sdf.org> | 2020-03-11 15:16:18 +0000 |
| commit | 7cdabdc0dff3bae1c7209f50c609ebf154d25ea7 (patch) | |
| tree | 5ef577ef2fcedfd58bd188cc35955dea9fd83513 /lib/pleroma/web | |
| parent | f92c447bbc38db417beb2ac505c17649c6de01d2 (diff) | |
| parent | fce090c1de543f0bcebf47cfc2a32f99f8ef401f (diff) | |
| download | pleroma-7cdabdc0dff3bae1c7209f50c609ebf154d25ea7.tar.gz | |
Merge branch 'fix/1610-release-compilation-config-fix' into 'develop'
Merging default release config on app start
Closes #1610
See merge request pleroma/pleroma!2288
Diffstat (limited to 'lib/pleroma/web')
| -rw-r--r-- | lib/pleroma/web/admin_api/admin_api_controller.ex | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/lib/pleroma/web/admin_api/admin_api_controller.ex b/lib/pleroma/web/admin_api/admin_api_controller.ex index de0755ee5..47b7d2da3 100644 --- a/lib/pleroma/web/admin_api/admin_api_controller.ex +++ b/lib/pleroma/web/admin_api/admin_api_controller.ex @@ -834,7 +834,7 @@ defmodule Pleroma.Web.AdminAPI.AdminAPIController do configs = ConfigDB.get_all_as_keyword() merged = - Config.Holder.config() + Config.Holder.default_config() |> ConfigDB.merge(configs) |> Enum.map(fn {group, values} -> Enum.map(values, fn {key, value} -> |