# Merge branch 'main' into panic-hunting · gitcafe/zed

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

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

Visibility: public

Requested revision: 6e84d8fbc01c90bc81272e1813717433a2b10297

Requested commit: 6e84d8fbc01c90bc81272e1813717433a2b10297

Commit: 6e84d8fbc01c90bc81272e1813717433a2b10297

Tree: 797d09ff751b046aeff9e37311de396235a92049

Author: Mikayla

Committer: Mikayla

## Message

```
Merge branch 'main' into panic-hunting

```

## Parents

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

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

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