Dominik Ritter d3500625ca Merge remote-tracking branch 'TheDan64/master' into staging_065 ... Conflicts were: - test/segments/rust_version.spec and powerlevel9k.zsh-theme. #826 removes grep from parsing the rust version on next; #703 changes color names.		2018-06-07 01:00:57 +02:00
..
functions	Fix tests on TravisCI	2017-03-20 00:21:49 +01:00
segments	Merge remote-tracking branch 'TheDan64/master' into staging_065	2018-06-07 01:00:57 +02:00
powerlevel9k.spec	Removed final SEDs and more comments	2018-02-23 00:36:12 +04:00