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/config/transfer_task.ex | |
| 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/config/transfer_task.ex')
| -rw-r--r-- | lib/pleroma/config/transfer_task.ex | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/lib/pleroma/config/transfer_task.ex b/lib/pleroma/config/transfer_task.ex index 435fc7450..7c3449b5e 100644 --- a/lib/pleroma/config/transfer_task.ex +++ b/lib/pleroma/config/transfer_task.ex @@ -83,7 +83,7 @@ defmodule Pleroma.Config.TransferTask do key = ConfigDB.from_string(setting.key) group = ConfigDB.from_string(setting.group) - default = Pleroma.Config.Holder.config(group, key) + default = Pleroma.Config.Holder.default_config(group, key) value = ConfigDB.from_binary(setting.value) merged_value = |