Merge remote-tracking branch 'upstream/master'

Conflicts:
	plugins/jsontools/jsontools.plugin.zsh
	templates/zshrc.zsh-template
This commit is contained in:
Gaetan Semet 2014-04-17 16:06:34 +02:00
commit b1307d9e19
2 changed files with 2 additions and 2 deletions

View file

@ -14,7 +14,7 @@ ZSH_THEME="stibbons"
# Uncomment the following line to use case-sensitive completion.
# CASE_SENSITIVE="true"
# Comment this out to disable weekly auto-update checks
# Uncomment the following line to disable bi-weekly auto-update checks.
DISABLE_AUTO_UPDATE="true"
# Uncomment the following line to change how often to auto-update (in days).