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

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

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

Visibility: public

Requested revision: 78573fb140c1187e48fd93aa1cacaf4d5104d018

Requested commit: 78573fb140c1187e48fd93aa1cacaf4d5104d018

Commit: 78573fb140c1187e48fd93aa1cacaf4d5104d018

Tree: e593916c0982888d6ebfd851e8da078b40f39523

Author: Marshall Bowers

Committer: Marshall Bowers

## Message

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

```

## Parents

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

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

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