# Merge branch 'main' into n/t2 · gitcafe/zed

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

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

Visibility: public

Requested revision: d0975aacac2a3e3bdf29988f35a70b338d870ad2

Requested commit: d0975aacac2a3e3bdf29988f35a70b338d870ad2

Commit: d0975aacac2a3e3bdf29988f35a70b338d870ad2

Tree: 5238846a32a0141ca76938e6c1b678ba1ff54290

Author: Nate Butler

Committer: Nate Butler

## Message

```
Merge branch 'main' into n/t2

```

## Parents

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

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

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