diff options
author | rinpatch <rinpatch@sdf.org> | 2020-03-15 21:54:24 +0000 |
---|---|---|
committer | rinpatch <rinpatch@sdf.org> | 2020-03-15 21:54:24 +0000 |
commit | bb49d8f5a0dbbad65a8f65a28cc2d0847b518067 (patch) | |
tree | 938fb7fd74053a816c21948b28d5f6cfb7443f37 /lib/pleroma/docs/json.ex | |
parent | e8493431bfc16977e43715bf8bdb09ac46580028 (diff) | |
parent | 8d15d6c3ab9aecb82ba5126bb5efef20b3dfef41 (diff) | |
download | pleroma-bb49d8f5a0dbbad65a8f65a28cc2d0847b518067.tar.gz |
Merge branch 'release/2.0.1' into 'stable'v2.0.1
2.0.1 release
See merge request pleroma/pleroma!2298
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!() |