# Merge branch 'main' into editor2-rendering · gitcafe/zed

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

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

Visibility: public

Requested revision: c59817cd72dc7cc9584b4621e403850c4a1e86b2

Requested commit: c59817cd72dc7cc9584b4621e403850c4a1e86b2

Commit: c59817cd72dc7cc9584b4621e403850c4a1e86b2

Tree: 7590add8a01bc3078a061fd58f165175b47d1c51

Author: Conrad Irwin

Committer: Conrad Irwin

## Message

```
Merge branch 'main' into editor2-rendering

```

## Parents

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

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

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