# Merge remote-tracking branch 'origin/main' into gpui2-no-send · gitcafe/zed

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

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

Visibility: public

Requested revision: db9ccd7f34af4024ad97ebf8f708add2f6b0ca99

Requested commit: db9ccd7f34af4024ad97ebf8f708add2f6b0ca99

Commit: db9ccd7f34af4024ad97ebf8f708add2f6b0ca99

Tree: e1753c465fe53d13972886d74fe48a79edc6ff72

Author: Nathan Sobo

Committer: Nathan Sobo

## Message

```
Merge remote-tracking branch 'origin/main' into gpui2-no-send

```

## Parents

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

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

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