diff options
| author | Alexander Strizhakov <alex.strizhakov@gmail.com> | 2020-03-12 18:31:10 +0300 |
|---|---|---|
| committer | Alexander Strizhakov <alex.strizhakov@gmail.com> | 2020-03-12 18:31:10 +0300 |
| commit | 39ed608b13f9204e0503311c7394934b01501ab8 (patch) | |
| tree | 34250ed1c719224a3522fd1a841bbd0a360e1245 /lib/pleroma/config/transfer_task.ex | |
| parent | 1306b92997dc6e76e5d617d529dbc229d5aee200 (diff) | |
| parent | 00d17520314e3591caaa7ab4ca39c6227a6bdf15 (diff) | |
| download | pleroma-39ed608b13f9204e0503311c7394934b01501ab8.tar.gz | |
Merge branch 'develop' into gun
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 b6d80adb7..936bc9ab1 100644 --- a/lib/pleroma/config/transfer_task.ex +++ b/lib/pleroma/config/transfer_task.ex @@ -104,7 +104,7 @@ defmodule Pleroma.Config.TransferTask do key = ConfigDB.from_string(setting.key) group = ConfigDB.from_string(setting.group) - default = Config.Holder.config(group, key) + default = Config.Holder.default_config(group, key) value = ConfigDB.from_binary(setting.value) merged_value = |