# Merge branch 'main' into pr/12906 · gitcafe/zed

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

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

Visibility: public

Requested revision: 8b30562762af0cd9454ac08a46f50bac1e5f5483

Requested commit: 8b30562762af0cd9454ac08a46f50bac1e5f5483

Commit: 8b30562762af0cd9454ac08a46f50bac1e5f5483

Tree: 107cf407863252b1f7cca5d32438c12f702293b3

Author: Marshall Bowers

Committer: Marshall Bowers

## Message

```
Merge branch 'main' into pr/12906

```

## Parents

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

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

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