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

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

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

Visibility: public

Requested revision: f5e5b44bc18359e56f7cd0e2846b0cddca1552cc

Requested commit: f5e5b44bc18359e56f7cd0e2846b0cddca1552cc

Commit: f5e5b44bc18359e56f7cd0e2846b0cddca1552cc

Tree: c376a7ff5f9135d6f43aaa4de3a45987f4cfe63a

Author: Marshall Bowers

Committer: Marshall Bowers

## Message

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

```

## Parents

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

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

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