aboutsummaryrefslogtreecommitdiff
path: root/lib/pleroma/docs/json.ex
diff options
context:
space:
mode:
authorEgor Kislitsyn <egor@kislitsyn.com>2020-03-12 16:02:24 +0400
committerEgor Kislitsyn <egor@kislitsyn.com>2020-03-12 16:02:24 +0400
commitd1c7f8e576e31487544b57d67802843b8ef38388 (patch)
tree891a5578ef2ad9d48230432d32b9e85cf9d575fc /lib/pleroma/docs/json.ex
parent0f386110c6e15148ff1ff5ea3451885485fcb7ff (diff)
parent00d17520314e3591caaa7ab4ca39c6227a6bdf15 (diff)
downloadpleroma-d1c7f8e576e31487544b57d67802843b8ef38388.tar.gz
Merge remote-tracking branch 'origin/develop' into global-status-expiration
Diffstat (limited to 'lib/pleroma/docs/json.ex')
-rw-r--r--lib/pleroma/docs/json.ex2
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!()