Merge remote-tracking branch 'upstream/master'

Conflicts:
	README.textile
	lib/aliases.zsh
	plugins/repo/repo.plugin.zsh
	templates/zshrc.zsh-template
	themes/ys.zsh-theme
This commit is contained in:
Gaetan Semet 2013-12-03 09:41:48 +01:00
commit 24f2838f0b
54 changed files with 1539 additions and 178 deletions

View file

@ -69,11 +69,11 @@ You can install this via the command line with either `curl` or `wget`.
h4. via `curl`
@curl -L https://github.com/stibbons/oh-my-zsh/raw/master/tools/install.sh | sh@
@curl -L https://raw.github.com/stibbons/oh-my-zsh/master/tools/install.sh | sh@
h4. via `wget`
@wget --no-check-certificate https://github.com/stibbons/oh-my-zsh/raw/master/tools/install.sh -O - | sh@
@wget --no-check-certificate https://raw.github.com/stibbons/oh-my-zsh/master/tools/install.sh -O - | sh@
h3. The manual way