pleroma

commit: 0f75ed33f94faca8cb370b91f9a32b7aa6f4c420
parent: 03702e4c4a3f7ca80d6adcdcd77b39e6a60809c6
Author: kaniini <nenolod@gmail.com>
Date:   Tue,  6 Nov 2018 07:33:27 +0000

Merge branch 'runtime-emojis-fix-finmoji-return' into 'develop'

Runtime emojis: Fix wrong return when finmoji is disabled

See merge request pleroma/pleroma!427
Diffstat:
M
lib/pleroma/emoji.ex
2
+-

1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/lib/pleroma/emoji.ex b/lib/pleroma/emoji.ex
@@ -153,7 +153,7 @@ defmodule Pleroma.Emoji do
     end)
   end
 
-  defp load_finmoji(_), do: :ok
+  defp load_finmoji(_), do: []
 
   defp load_from_file(file) do
     if File.exists?(file) do