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

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

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

Visibility: public

Requested revision: 23f11fcd5e1b33b7b6a930c2dde3f4532679ba40

Requested commit: 23f11fcd5e1b33b7b6a930c2dde3f4532679ba40

Commit: 23f11fcd5e1b33b7b6a930c2dde3f4532679ba40

Tree: 91b0a81f152c0e2db02b605a1a9e60d6cdb27cb5

Author: Antonio Scandurra

Committer: Antonio Scandurra

## Message

```
Merge branch 'main' into gpui2

```

## Parents

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

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

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