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

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

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

Visibility: public

Requested revision: 7fd35d68bbff10aa2005c187b50ead909ff813da

Requested commit: 7fd35d68bbff10aa2005c187b50ead909ff813da

Commit: 7fd35d68bbff10aa2005c187b50ead909ff813da

Tree: 940ed4535e3476b4eac15a0786a1420a14691c23

Author: Marshall Bowers

Committer: Marshall Bowers

## Message

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

```

## Parents

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

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

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