# Merge branch 'main' into storybook · gitcafe/zed

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

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

Visibility: public

Requested revision: 37ef28a3bf3d2b8bde91b2120529387a097e945a

Requested commit: 37ef28a3bf3d2b8bde91b2120529387a097e945a

Commit: 37ef28a3bf3d2b8bde91b2120529387a097e945a

Tree: 22c213d8e67da5e321a927ce94dd52d32c4044a6

Author: Nathan Sobo

Committer: Nathan Sobo

## Message

```
Merge branch 'main' into storybook

```

## Parents

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

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

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