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

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

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

Visibility: public

Requested revision: 9d261cf85922822ed8416ffd71fff97e2f52db11

Requested commit: 9d261cf85922822ed8416ffd71fff97e2f52db11

Commit: 9d261cf85922822ed8416ffd71fff97e2f52db11

Tree: 7fc3281131e6610bfeb91fefc07f84e0f774991a

Author: Conrad Irwin

Committer: Conrad Irwin

## Message

```
Merge branch 'main' into jk

```

## Parents

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

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

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