diff options
| author | Ivan Tashkinov <ivantashkinov@gmail.com> | 2020-03-12 12:07:07 +0300 |
|---|---|---|
| committer | Ivan Tashkinov <ivantashkinov@gmail.com> | 2020-03-12 12:07:07 +0300 |
| commit | bd40880fa0ed328c2948bb145354a8292fe051b5 (patch) | |
| tree | d997a20a129cd72fe24c1f7169e1f6952339ce02 /lib/pleroma/docs/json.ex | |
| parent | 5b696a8ac1b5a06e60c2143cf88e014b28e14702 (diff) | |
| parent | 00d17520314e3591caaa7ab4ca39c6227a6bdf15 (diff) | |
| download | pleroma-bd40880fa0ed328c2948bb145354a8292fe051b5.tar.gz | |
Merge remote-tracking branch 'remotes/origin/develop' into 1560-non-federating-instances-routes-restrictions
# Conflicts:
# test/web/activity_pub/activity_pub_controller_test.exs
Diffstat (limited to 'lib/pleroma/docs/json.ex')
| -rw-r--r-- | lib/pleroma/docs/json.ex | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/lib/pleroma/docs/json.ex b/lib/pleroma/docs/json.ex index 6508a7bdb..74f8b2615 100644 --- a/lib/pleroma/docs/json.ex +++ b/lib/pleroma/docs/json.ex @@ -15,7 +15,7 @@ defmodule Pleroma.Docs.JSON do end def compile do - with config <- Pleroma.Config.Loader.load("config/description.exs") do + with config <- Pleroma.Config.Loader.read("config/description.exs") do config[:pleroma][:config_description] |> Pleroma.Docs.Generator.convert_to_strings() |> Jason.encode!() |