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

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

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

Visibility: public

Requested revision: b5eae86b675449a339c367994e83af6dfdfa0987

Requested commit: b5eae86b675449a339c367994e83af6dfdfa0987

Commit: b5eae86b675449a339c367994e83af6dfdfa0987

Tree: f6d494b805fd35aff7ef32f1adca9fefdae57f2d

Author: Marshall Bowers

Committer: Marshall Bowers

## Message

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

```

## Parents

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

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

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