# Merge branch 'main' into gpui2 · gitcafe/zed

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

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

Visibility: public

Requested revision: ef18aaa66fbfdfdd110ecb389a105ef28184f606

Requested commit: ef18aaa66fbfdfdd110ecb389a105ef28184f606

Commit: ef18aaa66fbfdfdd110ecb389a105ef28184f606

Tree: fcf8a8a0b648d01e7ddeaed2914821a17cd81912

Author: Marshall Bowers

Committer: Marshall Bowers

## Message

```
Merge branch 'main' into gpui2

```

## Parents

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

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

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