nullobsi/akkoma
1
0
Fork 0
forked from AkkomaGang/akkoma
Code Issues Pull requests Projects Releases Packages Wiki Activity

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

Browse source 
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
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
defp load_finmoji(_), do: :ok
defp load_finmoji(_), do: []
defp load_from_file(file) do
if File.exists?(file) do