# Merge branch 'main' into nate/storybook-components · gitcafe/zed

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

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

Visibility: public

Requested revision: c7ad89d7faa1b5950f109830ef94465fe5739a64

Requested commit: c7ad89d7faa1b5950f109830ef94465fe5739a64

Commit: c7ad89d7faa1b5950f109830ef94465fe5739a64

Tree: a49f84f2e882c2b9959651e04484e01525d6a31a

Author: Nate Butler

Committer: Nate Butler

## Message

```
Merge branch 'main' into nate/storybook-components

```

## Parents

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

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

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