diff options
| author | Alexander Strizhakov <alex.strizhakov@gmail.com> | 2020-01-20 18:25:00 +0300 |
|---|---|---|
| committer | Alexander Strizhakov <alex.strizhakov@gmail.com> | 2020-01-20 18:25:00 +0300 |
| commit | 8023fa48dbc68fe696337a4da940b95fd209e304 (patch) | |
| tree | 432600b7446f65e05fb4bbe2994c7369b82c79f0 /lib/pleroma/web/admin_api/admin_api_controller.ex | |
| parent | efb8ef5abee1a8defa2bfba40ad1065db4c09ddf (diff) | |
| download | pleroma-8023fa48dbc68fe696337a4da940b95fd209e304.tar.gz | |
merge fix
Diffstat (limited to 'lib/pleroma/web/admin_api/admin_api_controller.ex')
| -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 cc658dc0e..30343a9f1 100644 --- a/lib/pleroma/web/admin_api/admin_api_controller.ex +++ b/lib/pleroma/web/admin_api/admin_api_controller.ex @@ -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 = |