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

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

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

Visibility: public

Requested revision: 7bacdefa2ed276d0b78905a05e11e4594093396c

Requested commit: 7bacdefa2ed276d0b78905a05e11e4594093396c

Commit: 7bacdefa2ed276d0b78905a05e11e4594093396c

Tree: ed5943c181926cad338672fd71e0ccc0d39cf80e

Author: Marshall Bowers

Committer: Marshall Bowers

## Message

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

```

## Parents

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

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

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