Merge remote-tracking branch 'upstream/master'

# Conflicts:
#	templates/zshrc.zsh-template
This commit is contained in:
Gaetan Semet 2016-08-29 18:00:33 +02:00
commit c97f1d133d
37 changed files with 760 additions and 209 deletions

View file

@ -76,3 +76,5 @@ zsh-pip-test-clean-packages() {
echo "the djangopypi2 index is fine"
fi
}
alias pip="noglob pip" # allows square brackets for pip command invocation