Merge remote-tracking branch 'upstream/master'

Browse source

Conflicts:
	templates/zshrc.zsh-template

...

This commit is contained in:

Gaetan Semet 2014-03-24 11:54:41 +01:00

parent dde77fc8b5 ffc17b6b4d

commit 5afa441d66

36 changed files with 2060 additions and 103 deletions

Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL

Download patch file Download diff file Expand all files Collapse all files

0

custom/example/example.plugin.zsh → custom/plugins/example/example.plugin.zsh

Unescape Escape View file