moon
/
spc-pleroma
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

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
parent 03702e4c4a 83911b1443
commit 0f75ed33f9
1 changed files with 1 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
lib/pleroma/emoji.ex
View File

@ -153,7 +153,7 @@ defp load_finmoji(true) do
end) end)
end end
defp load_finmoji(_), do: :ok defp load_finmoji(_), do: []
defp load_from_file(file) do defp load_from_file(file) do
if File.exists?(file) do if File.exists?(file) do