Merge remote-tracking branch 'cadusk/master'

Conflicts:
	README.textile
	lib/aliases.zsh
	templates/zshrc-linux.zsh
	templates/zshrc-mac.zsh
	templates/zshrc.zsh-template
This commit is contained in:
Gaetan Semet 2014-10-07 11:53:12 +02:00
commit cf1c065d71
5 changed files with 54 additions and 16 deletions

View file

@ -191,6 +191,6 @@ We have enough themes for the time being. Please fork the project and add on in
h2. Contributors
This project wouldn't exist without all of our awesome users and contributors: "view our growing list of contributors":https://github.com/robbyrussell/oh-my-zsh/contributors
This project wouldn't exist without all of our awesome users and contributors: "view our growing list of contributors":https://github.com/stibbons/oh-my-zsh/contributors
Thank you so much!