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

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

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

Visibility: public

Requested revision: a464a7da2a644ddbfc2c13b3554637d9f89a2ae7

Requested commit: a464a7da2a644ddbfc2c13b3554637d9f89a2ae7

Commit: a464a7da2a644ddbfc2c13b3554637d9f89a2ae7

Tree: 111bcfc2230d5b5525f1b7d2620d93bf39fe428c

Author: Julia

Committer: Julia

## Message

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

```

## Parents

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

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

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