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

4
.gitignore vendored
View file

@ -1,8 +1,8 @@
locals.zsh
log/.zsh_history
projects.zsh
custom/*
!custom/example
custom
!custom/plugins/example
!custom/example.zsh
*.swp
*.un~