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

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

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

Visibility: public

Requested revision: 24e21a4c296d64841a1c7bb86583f32635f7d859

Requested commit: 24e21a4c296d64841a1c7bb86583f32635f7d859

Commit: 24e21a4c296d64841a1c7bb86583f32635f7d859

Tree: 60d0bcf5a337314a30ba1202aa8b793e57311936

Author: Marshall Bowers

Committer: Marshall Bowers

## Message

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

```

## Parents

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

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

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