# Merge branch 'zed2' of github.com:zed-industries/zed into zed2 · gitcafe/zed

[View on GitCafe](https://git.cafe/gitcafe/zed/commit/afad2fbfa24a4930901f297fc0baefed272fcd13)

Repository: [gitcafe/zed](https://git.cafe/gitcafe/zed)

Visibility: public

Requested revision: afad2fbfa24a4930901f297fc0baefed272fcd13

Requested commit: afad2fbfa24a4930901f297fc0baefed272fcd13

Commit: afad2fbfa24a4930901f297fc0baefed272fcd13

Tree: 61002b37799648ceaf1bf7a337533f1391f3ff5d

Author: Marshall Bowers

Committer: Marshall Bowers

## Message

```
Merge branch 'zed2' of github.com:zed-industries/zed into zed2

```

## Parents

- [d6bd000aa8dba77624ee7866eed5c6b04ebe0ec3](https://git.cafe/gitcafe/zed/commit/d6bd000aa8dba77624ee7866eed5c6b04ebe0ec3?format=markdown)

- [18930c33fe0b5fc7bc2852547201ed7226f841ad](https://git.cafe/gitcafe/zed/commit/18930c33fe0b5fc7bc2852547201ed7226f841ad?format=markdown)

[Source at this commit](https://git.cafe/gitcafe/zed/tree/afad2fbfa24a4930901f297fc0baefed272fcd13?format=markdown)