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

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

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

Visibility: public

Requested revision: 740b1053307c0cf8515d05f0e594dcf521cb9cd6

Requested commit: 740b1053307c0cf8515d05f0e594dcf521cb9cd6

Commit: 740b1053307c0cf8515d05f0e594dcf521cb9cd6

Tree: 310561873fe782b139f803f4d4a056fd5d630f4c

Author: Nathan Sobo

Committer: Nathan Sobo

## Message

```
Merge branch 'main' into taffy

Co-Authored-By: Mikayla Maki <mikayla@zed.dev>

```

## Parents

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

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

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