Merge branch 'master' of http://gitlab.rez/lhark/rc

Browse source

Conflicts:
	zshrc

...

This commit is contained in:

lhark 2015-06-07 01:08:45 +02:00

parent 6ade4d0dbc 7f3ff2955e

commit cd65e6698a

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

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

Diff content is not available