# Merge branch 'gpui2' into zed2 · gitcafe/zed

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

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

Visibility: public

Requested revision: bb35583998f4d2ac1bb7ce24be83988e26065b97

Requested commit: bb35583998f4d2ac1bb7ce24be83988e26065b97

Commit: bb35583998f4d2ac1bb7ce24be83988e26065b97

Tree: 1061a11116935a17c06b0283b92838c2ba84ff4f

Author: Marshall Bowers

Committer: Marshall Bowers

## Message

```
Merge branch 'gpui2' into zed2

```

## Parents

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

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

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