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

Runtime emojis: Fix wrong return when finmoji is disabled

See merge request pleroma/pleroma!427
This commit is contained in:
kaniini 2018-11-06 07:33:27 +00:00
commit 0f75ed33f9

View file

@ -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