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

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

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

Visibility: public

Requested revision: 26f442a675d016b58df0d2c75cfbaed8187f0be8

Requested commit: 26f442a675d016b58df0d2c75cfbaed8187f0be8

Commit: 26f442a675d016b58df0d2c75cfbaed8187f0be8

Tree: 5a90094fc7b51ceea7053c5d13b7fb194b4e4d78

Author: Nate Butler

Committer: Nate Butler

## Message

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

```

## Parents

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

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

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