Merge branch 'master' of github.com:unphased/oh-my-zsh into mine-master

Browse source

Conflicts:
	zshrc

...

This commit is contained in:

Steven Lu 2013-07-19 00:28:33 -04:00

parent 606be8570d 83f01cc9ab

commit 3a76c5764d

Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL

Download patch file Download diff file Expand all files Collapse all files

Diff content is not available