diff options
| author | Dominik Ritter <dritter03@googlemail.com> | 2018-06-07 02:00:57 +0300 |
|---|---|---|
| committer | Dominik Ritter <dritter03@googlemail.com> | 2018-06-07 02:00:57 +0300 |
| commit | d3500625ca8646dfaaf91103cc5c33c74a958955 (patch) | |
| tree | e7e57a2fe254a7a8b791b0c10f6c16abe6213338 /README.md | |
| parent | e763fa14b0f7117071072d4ed174cb639e76526a (diff) | |
| parent | 4df61d923a4a0abc1384f7b59af72c3441016cb6 (diff) | |
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.
Diffstat (limited to 'README.md')
0 files changed, 0 insertions, 0 deletions