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

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

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

Visibility: public

Requested revision: 452006560e6a134e9c98c3fa1c3b220a645146bc

Requested commit: 452006560e6a134e9c98c3fa1c3b220a645146bc

Commit: 452006560e6a134e9c98c3fa1c3b220a645146bc

Tree: 03cce4adbfa1d8456f50ed6cd2b316968b60a4f8

Author: Marshall Bowers

Committer: Conrad Irwin

## Message

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

```

## Parents

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

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

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