ohmyzsh/plugins/common-aliases
Gaetan Semet ec49ae1a98 Merge remote-tracking branch 'upstream/master'
Conflicts:
	lib/git.zsh
	plugins/common-aliases/common-aliases.plugin.zsh
	plugins/repo/repo.plugin.zsh
	templates/zshrc.zsh-template
2014-07-03 16:18:02 +02:00
..
common-aliases.plugin.zsh Merge remote-tracking branch 'upstream/master' 2014-07-03 16:18:02 +02:00