Merge remote-tracking branch 'upstream/master' into emacs
Conflicts: plugins/emacs/emacs.plugin.zsh plugins/emacs/emacsclient.sh
plugins/redis-cli/_redis-cli
0 → 100644
plugins/rvm/_rvm
0 → 100644
plugins/rvm/rvm.plugin.zsh
0 → 100644
plugins/taskwarrior/_task
0 → 100644
plugins/thor/_thor
0 → 100644
plugins/yum/yum.plugin.zsh
0 → 100644
themes/alanpeabody.zsh-theme
0 → 100644
themes/blinks.zsh-theme
0 → 100644
themes/crunch.zsh-theme
0 → 100644
Please register or sign in to comment