projects
/
akkoma
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
| inline |
side by side
Merge branch 'develop' into issue/1276
[akkoma]
/
lib
/
pleroma
/
config
/
transfer_task.ex
diff --git
a/lib/pleroma/config/transfer_task.ex
b/lib/pleroma/config/transfer_task.ex
index b6d80adb7fdc27c55687b944827f416ad04ee31a..936bc9ab1d1cb7d4b45ef442a675b73f368c9a2d 100644
(file)
--- 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 =