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

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

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

Visibility: public

Requested revision: 204aba07f6c7aa2d6dbb3a98848a66fbbb658181

Requested commit: 204aba07f6c7aa2d6dbb3a98848a66fbbb658181

Commit: 204aba07f6c7aa2d6dbb3a98848a66fbbb658181

Tree: f692675c734d692f1a6998c961e54881bc896627

Author: KCaverly

Committer: KCaverly

## Message

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

```

## Parents

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

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

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