Gaetan Semet 9a63084e20 Merge remote-tracking branch 'upstream/master' ... Conflicts: plugins/git/git.plugin.zsh plugins/jump/jump.plugin.zsh		2015-08-10 16:15:53 +02:00
..
zshrc-linux.zsh	rm temp envvar	2015-08-10 16:13:04 +02:00
zshrc-mac.zsh	sync plugins with mac	2014-11-24 13:44:58 +01:00
zshrc.zsh-template	Merge remote-tracking branch 'upstream/master'	2015-08-10 16:15:53 +02:00