aboutsummaryrefslogtreecommitdiff
path: root/lib/pleroma/docs/json.ex
diff options
context:
space:
mode:
authorrinpatch <rinpatch@sdf.org>2020-03-11 15:16:18 +0000
committerrinpatch <rinpatch@sdf.org>2020-03-11 15:16:18 +0000
commit7cdabdc0dff3bae1c7209f50c609ebf154d25ea7 (patch)
tree5ef577ef2fcedfd58bd188cc35955dea9fd83513 /lib/pleroma/docs/json.ex
parentf92c447bbc38db417beb2ac505c17649c6de01d2 (diff)
parentfce090c1de543f0bcebf47cfc2a32f99f8ef401f (diff)
downloadpleroma-7cdabdc0dff3bae1c7209f50c609ebf154d25ea7.tar.gz
Merge branch 'fix/1610-release-compilation-config-fix' into 'develop'
Merging default release config on app start Closes #1610 See merge request pleroma/pleroma!2288
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!()