Gaetan Semet c97f1d133d Merge remote-tracking branch 'upstream/master' ... # Conflicts: # templates/zshrc.zsh-template		2016-08-29 18:00:33 +02:00
..
zshrc-linux.zsh	new plugin: yocto	2016-05-26 15:25:41 +02:00
zshrc-mac.zsh	add 'osx' plugin on mac	2016-06-29 00:32:24 +02:00
zshrc.zsh-template	Merge remote-tracking branch 'upstream/master'	2016-08-29 18:00:33 +02:00