# Merge branch 'main' into editor-tests · gitcafe/zed

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

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

Visibility: public

Requested revision: 7d1593b90c2c344d0e6c371d5fe1b823501984e2

Requested commit: 7d1593b90c2c344d0e6c371d5fe1b823501984e2

Commit: 7d1593b90c2c344d0e6c371d5fe1b823501984e2

Tree: e84c9ca3b6ffad4d8712896c9b93b30af76a6c93

Author: Mikayla

Committer: Mikayla

## Message

```
Merge branch 'main' into editor-tests

```

## Parents

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

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

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