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

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

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

Visibility: public

Requested revision: 40e785fdff8f253823c2c5872a75bbd918813073

Requested commit: 40e785fdff8f253823c2c5872a75bbd918813073

Commit: 40e785fdff8f253823c2c5872a75bbd918813073

Tree: 018936f105e541fecd8a6b44915cccc90225a49c

Author: Nate Butler

Committer: Nate Butler

## Message

```
Merge branch 'main' into nate/gpui2-ui-components

```

## Parents

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

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

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