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

Runtime emojis: Fix wrong return when finmoji is disabled See merge request pleroma/pleroma!427
2018-11-06 07:33:27 +00:00 · 2018-11-06 07:33:27 +00:00 · 0f75ed33f9
parent 03702e4c4a 83911b1443
commit 0f75ed33f9
1 changed files with 1 additions and 1 deletions
--- a/lib/pleroma/emoji.ex
+++ b/lib/pleroma/emoji.ex
@ -153,7 +153,7 @@ defp load_finmoji(true) do
    end)
  end

-  defp load_finmoji(_), do: :ok
+  defp load_finmoji(_), do: []

  defp load_from_file(file) do
    if File.exists?(file) do