# Merge remote-tracking branch 'origin/main' into jk · gitcafe/zed

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

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

Visibility: public

Requested revision: b9c7bafc802e99e32bf1d58d6c8e16124fca0dff

Requested commit: b9c7bafc802e99e32bf1d58d6c8e16124fca0dff

Commit: b9c7bafc802e99e32bf1d58d6c8e16124fca0dff

Tree: b0a29c16d8f8c70c37a6d1b0c02129082f036616

Author: Conrad Irwin

Committer: Conrad Irwin

## Message

```
Merge remote-tracking branch 'origin/main' into jk

```

## Parents

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

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

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