# Merge branch 'main' into editor-integration · gitcafe/zed

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

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

Visibility: public

Requested revision: 4404e76a2d8e0c234c94668cddf876847e484ae4

Requested commit: 4404e76a2d8e0c234c94668cddf876847e484ae4

Commit: 4404e76a2d8e0c234c94668cddf876847e484ae4

Tree: 324382739b87a65f5f24e4253091a32fd070c7d9

Author: Mikayla

Committer: Mikayla

## Message

```
Merge branch 'main' into editor-integration

```

## Parents

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

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

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