Merge remote-tracking branch 'upstream/master'

This commit is contained in:
Gaetan Semet 2014-12-23 16:51:46 +01:00
commit 1611be25ff
30 changed files with 239 additions and 151 deletions

View file

@ -22,8 +22,6 @@ if [[ -z "$epoch_target" ]]; then
epoch_target=13
fi
[ -f ~/.profile ] && source ~/.profile
# Cancel upgrade if the current user doesn't have write permissions for the
# oh-my-zsh directory.
[[ -w "$ZSH" ]] || return 0