Merge remote-tracking branch 'upstream/master'

Conflicts:
	templates/zshrc.zsh-template
This commit is contained in:
Gaetan Semet 2014-03-24 11:54:41 +01:00
commit 5afa441d66
36 changed files with 2060 additions and 103 deletions

View file

@ -0,0 +1,2 @@
# Add your own custom plugins in the custom/plugins directory. Plugins placed
# here will override ones with the same name in the main plugins directory.