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

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

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

Visibility: public

Requested revision: 98e24908071f433c1680c09181723ea5e5ab3f78

Requested commit: 98e24908071f433c1680c09181723ea5e5ab3f78

Commit: 98e24908071f433c1680c09181723ea5e5ab3f78

Tree: dc370c460a547e18a096483c63ea63534ddc5730

Author: Marshall Bowers

Committer: Marshall Bowers

## Message

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

```

## Parents

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

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

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