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

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

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

Visibility: public

Requested revision: 189ddf93800b75fa9ad7d60a54a5eb39a76ec771

Requested commit: 189ddf93800b75fa9ad7d60a54a5eb39a76ec771

Commit: 189ddf93800b75fa9ad7d60a54a5eb39a76ec771

Tree: fb4c401503a696b34ce932cfc7a60c42acfbbd2d

Author: Julia

Committer: Julia

## Message

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

```

## Parents

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

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

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