Merge branch 'master' of https://github.com/netzverweigerer/oh-my-zsh

Browse source

Conflicts:
	zshrc

...

This commit is contained in:

Armin Jenewein 2015-03-26 11:23:38 +01:00

parent e9e8e2f93a 202ae23fc7

commit 983c4d0b5d

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