# Merge branch 'main' into marshall/gpui2-playground · gitcafe/zed

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

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

Visibility: public

Requested revision: ad8187b151ff0692f2a33bdc5d62a56d9da2c09f

Requested commit: ad8187b151ff0692f2a33bdc5d62a56d9da2c09f

Commit: ad8187b151ff0692f2a33bdc5d62a56d9da2c09f

Tree: 2d6954a07fd821fe73a5ed89e5b16e861f570f23

Author: Marshall Bowers

Committer: Marshall Bowers

## Message

```
Merge branch 'main' into marshall/gpui2-playground

```

## Parents

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

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

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