# Merge branch 'main' into editor2_tests · gitcafe/zed

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

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

Visibility: public

Requested revision: 4cb4033a3614c6122fc9b2a54e8b727dbc08b57e

Requested commit: 4cb4033a3614c6122fc9b2a54e8b727dbc08b57e

Commit: 4cb4033a3614c6122fc9b2a54e8b727dbc08b57e

Tree: ab203fb399d8ee9a8e1c8f489742af3575d5e599

Author: Marshall Bowers

Committer: Marshall Bowers

## Message

```
Merge branch 'main' into editor2_tests

```

## Parents

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

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

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