# Merge branch 'main' into unborked-git-zed2-diagnostics-view · gitcafe/zed

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

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

Visibility: public

Requested revision: 3655a96e541c5e10d8d1a26e9b34c7cf8de8ba72

Requested commit: 3655a96e541c5e10d8d1a26e9b34c7cf8de8ba72

Commit: 3655a96e541c5e10d8d1a26e9b34c7cf8de8ba72

Tree: c7b1b2d6f19f33efee8b5c677ebec3a25d3f35a1

Author: Julia

Committer: Julia

## Message

```
Merge branch 'main' into unborked-git-zed2-diagnostics-view

```

## Parents

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

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

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