ohmyzsh/templates
Gaetan Semet bd32698531 Merge remote-tracking branch 'upstream/master'
Conflicts:
	.gitignore
	plugins/git/git.plugin.zsh
	plugins/jump/jump.plugin.zsh
	templates/zshrc.zsh-template
2013-09-24 14:30:27 +02:00
..
zshrc-linux.zsh Merge remote-tracking branch 'cadusk/master' 2013-06-13 17:13:13 +02:00
zshrc-mac.zsh Changed default plugins for mac and linux templates 2013-06-05 23:56:06 +02:00
zshrc.zsh-template Merge remote-tracking branch 'upstream/master' 2013-09-24 14:30:27 +02:00