# Merge branch 'main' into diagnostics-style-2 · gitcafe/zed

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

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

Visibility: public

Requested revision: fb352af35cbaa5505d2d457a64d78bf0146333fb

Requested commit: fb352af35cbaa5505d2d457a64d78bf0146333fb

Commit: fb352af35cbaa5505d2d457a64d78bf0146333fb

Tree: 721fa960d4a0134b3d41adfebb61ad925330b7ad

Author: Marshall Bowers

Committer: Marshall Bowers

## Message

```
Merge branch 'main' into diagnostics-style-2

```

## Parents

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

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

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