logo

pleroma

My custom branche(s) on git.pleroma.social/pleroma/pleroma
commit: db0c00db8beb0a1197d313fa5733a43a0e6c07e8
parent: f60beecfa7891d06018f8065b865188118e99eac
Author: kaniini <ariadne@dereferenced.org>
Date:   Mon, 23 Sep 2019 22:30:31 +0000

Merge branch 'emoji-pack-json-pretty' into 'develop'

Also pretty print pack.json

See merge request pleroma/pleroma!1710

Diffstat:

Mlib/pleroma/web/pleroma_api/controllers/emoji_api_controller.ex2+-
1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/lib/pleroma/web/pleroma_api/controllers/emoji_api_controller.ex b/lib/pleroma/web/pleroma_api/controllers/emoji_api_controller.ex @@ -242,7 +242,7 @@ keeping it in cache for #{div(cache_ms, 1000)}s") File.write!( pack_file_p, - Jason.encode!(%{pack: %{}, files: %{}}) + Jason.encode!(%{pack: %{}, files: %{}}, pretty: true) ) conn |> json("ok")