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

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

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

Visibility: public

Requested revision: b8ae949dbe7cf2ac8afc8bf64dfd851d838cec46

Requested commit: b8ae949dbe7cf2ac8afc8bf64dfd851d838cec46

Commit: b8ae949dbe7cf2ac8afc8bf64dfd851d838cec46

Tree: 96f694307d06a6ba44985aa9f4f477a30de0c8f0

Author: Marshall Bowers

Committer: Marshall Bowers

## Message

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

```

## Parents

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

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

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