Merge remote-tracking branch 'upstream/master'

# Conflicts:
#	plugins/npm/npm.plugin.zsh
This commit is contained in:
Gaetan Semet 2018-04-27 12:06:08 +02:00
commit e357d762b5
37 changed files with 2399 additions and 591 deletions

View file

@ -49,7 +49,7 @@ main() {
umask g-w,o-w
printf "${BLUE}Cloning Oh My Zsh...${NORMAL}\n"
hash git >/dev/null 2>&1 || {
command -v git >/dev/null 2>&1 || {
echo "Error: git is not installed"
exit 1
}