ohmyzsh/templates
Gaetan Semet b1307d9e19 Merge remote-tracking branch 'upstream/master'
Conflicts:
	plugins/jsontools/jsontools.plugin.zsh
	templates/zshrc.zsh-template
2014-04-17 16:06:34 +02:00
..
zshrc-linux.zsh Merge remote-tracking branch 'cadusk/master' 2014-03-24 11:56:16 +01:00
zshrc-mac.zsh Merge remote-tracking branch 'cadusk/master' 2014-03-24 11:56:16 +01:00
zshrc.zsh-template Merge remote-tracking branch 'upstream/master' 2014-04-17 16:06:34 +02:00