ohmyzsh/plugins/common-aliases
Gaetan Semet a32d89278a Merge remote-tracking branch 'upstream/master'
Conflicts:
	plugins/jump/jump.plugin.zsh
	themes/ys.zsh-theme
2014-11-24 13:43:37 +01:00
..
common-aliases.plugin.zsh Merge remote-tracking branch 'upstream/master' 2014-11-24 13:43:37 +01:00