diff options
| author | kaniini <ariadne@dereferenced.org> | 2019-09-23 22:30:31 +0000 |
|---|---|---|
| committer | kaniini <ariadne@dereferenced.org> | 2019-09-23 22:30:31 +0000 |
| commit | db0c00db8beb0a1197d313fa5733a43a0e6c07e8 (patch) | |
| tree | 09f64ceb8877cd5bba475256eaccd164ff5573cf | |
| parent | f60beecfa7891d06018f8065b865188118e99eac (diff) | |
| parent | e63f167f013c1c159c40745ee44535c65b999ffb (diff) | |
| download | pleroma-db0c00db8beb0a1197d313fa5733a43a0e6c07e8.tar.gz | |
Merge branch 'emoji-pack-json-pretty' into 'develop'
Also pretty print pack.json
See merge request pleroma/pleroma!1710
| -rw-r--r-- | lib/pleroma/web/pleroma_api/controllers/emoji_api_controller.ex | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/lib/pleroma/web/pleroma_api/controllers/emoji_api_controller.ex b/lib/pleroma/web/pleroma_api/controllers/emoji_api_controller.ex index 6beca426a..3ad29bd38 100644 --- 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") |