Merge branch 'master' of https://github.com/DiegoMagdaleno/exa into DiegoMagdaleno-master

# Conflicts:
#	src/output/icons.rs
This commit is contained in:
Benjamin Sago 2020-10-08 22:23:18 +01:00
commit 1ee8fab7de

View File

@ -184,6 +184,7 @@ fn icon(file: &File) -> char {
"groovy" => '\u{e775}',
"iso" => '\u{e271}',
"lock" => '\u{f023}',
"swift" => '\u{e755}',
_ => '\u{f016}'
}
} else {