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

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

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

Visibility: public

Requested revision: 73360d37f7cf1b45b79bb50d146c60e89e9f0cd3

Requested commit: 73360d37f7cf1b45b79bb50d146c60e89e9f0cd3

Commit: 73360d37f7cf1b45b79bb50d146c60e89e9f0cd3

Tree: 6caa13a5ae21acee27821f80b485f1c8d759ce58

Author: Marshall Bowers

Committer: Marshall Bowers

## Message

```
Merge branch 'main' into gpui2

```

## Parents

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

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

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