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

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

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

Visibility: public

Requested revision: 204ef451d0954c6f6a31279514059d38ad7f724a

Requested commit: 204ef451d0954c6f6a31279514059d38ad7f724a

Commit: 204ef451d0954c6f6a31279514059d38ad7f724a

Tree: 1f441c7cbfed1bc08c9bc103f88129904691e4de

Author: Conrad Irwin

Committer: Conrad Irwin

## Message

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

```

## Parents

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

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

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