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

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

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

Visibility: public

Requested revision: 4c5d5105f350ae313de066e517b3680fcf1e3eea

Requested commit: 4c5d5105f350ae313de066e517b3680fcf1e3eea

Commit: 4c5d5105f350ae313de066e517b3680fcf1e3eea

Tree: 58cd719492280cfd70ef429aeaca7f0902ae1064

Author: Mikayla

Committer: Mikayla

## Message

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

```

## Parents

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

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

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