diff options
| author | Dominik Ritter <dritter03@googlemail.com> | 2018-06-07 02:36:56 +0300 |
|---|---|---|
| committer | Dominik Ritter <dritter03@googlemail.com> | 2018-06-07 02:51:16 +0300 |
| commit | d9d9fb9b6b9ede92fe76682c0fa4e03a29853695 (patch) | |
| tree | 4fceb0d6b41f5b992cb92f14bcf209881010e10b /test-bsd-vm/bootstrap-zero.sh | |
| parent | 5eedb2586be2c0107ebd159d50833664c612ce69 (diff) | |
| parent | 9c4203bdf80440b43b5f559b5d8856f6b817ad9e (diff) | |
Merge remote-tracking branch 'ytang/fix-icons-cut-off' into staging_065
Conflicts were:
- test/segments/command_execution_time.spec and
test/segments/go_version.spec: All conflicts come from renaming color
names on next (#703) and adding a whitespace to the Visual Identifier
(#854) on master.
Diffstat (limited to 'test-bsd-vm/bootstrap-zero.sh')
0 files changed, 0 insertions, 0 deletions