Merge remote-tracking branch 'upstream/master'

# Conflicts:
#	plugins/npm/npm.plugin.zsh
This commit is contained in:
Gaetan Semet 2018-04-27 12:06:08 +02:00
commit e357d762b5
37 changed files with 2399 additions and 591 deletions

View file

@ -0,0 +1 @@
# Put your custom themes in this folder.