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

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

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

Visibility: public

Requested revision: 8fb7c174b0bfd8eb705b6cdac5734ac296682505

Requested commit: 8fb7c174b0bfd8eb705b6cdac5734ac296682505

Commit: 8fb7c174b0bfd8eb705b6cdac5734ac296682505

Tree: 1be1e1ea80fe18e3271c95eaf9cacd0fa33a0059

Author: Marshall Bowers

Committer: Marshall Bowers

## Message

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

```

## Parents

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

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

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