projects
/
akkoma
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
| inline |
side by side
Merge branch 'develop' into issue/1276
[akkoma]
/
lib
/
pleroma
/
web
/
pleroma_api
/
controllers
/
emoji_api_controller.ex
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 42f62d97a1ee3d511148a32434cd1790e00e8210..a2f6d2287f5a4f2966f2977532f979e0c22ba9d0 100644
(file)
--- a/
lib/pleroma/web/pleroma_api/controllers/emoji_api_controller.ex
+++ b/
lib/pleroma/web/pleroma_api/controllers/emoji_api_controller.ex
@@
-591,7
+591,7
@@
keeping it in cache for #{div(cache_ms, 1000)}s")
{:ok, %{access: _}} ->
conn
|> put_status(:internal_server_error)
- |> json(%{error: "Error
emoji pack directory must be writable and read
able"})
+ |> json(%{error: "Error
: emoji pack directory must be writ
able"})
{:error, _} ->
conn