hj/pleroma
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

merge fix

Browse source
This commit is contained in:
Alexander Strizhakov 2020-01-20 18:25:00 +03:00
commit 8023fa48db
No known key found for this signature in database
GPG key ID: 022896A53AEF1381
2 changed files with 20 additions and 2 deletions
Download patch file Download diff file Expand all files Collapse all files

2
lib/pleroma/web/admin_api/admin_api_controller.ex
View file

@ -826,7 +826,7 @@ defmodule Pleroma.Web.AdminAPI.AdminAPIController do
else
merged =
Pleroma.Config.Holder.config()
|> DeepMerge.deep_merge(configs)
|> ConfigDB.merge(configs)
|> Enum.map(fn {group, values} ->
Enum.map(values, fn {key, value} ->
db =