Merge remote-tracking branch 'upstream/master'

# Conflicts:
#	.gitignore
This commit is contained in:
Gaetan Semet 2016-05-26 15:28:55 +02:00
commit e027530ca5
60 changed files with 1813 additions and 268 deletions

6
.gitignore vendored
View file

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