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

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

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

Visibility: public

Requested revision: 4a6a17d8669615c08924056cf6974abc424f6ae6

Requested commit: 4a6a17d8669615c08924056cf6974abc424f6ae6

Commit: 4a6a17d8669615c08924056cf6974abc424f6ae6

Tree: 764a5b41529c8c0d66f5cca4815dffc887a2d97d

Author: Conrad Irwin

Committer: Conrad Irwin

## Message

```
Merge branch 'main' into zed2

```

## Parents

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

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

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