# Merge branch 'gpui2' of github.com:zed-industries/zed into gpui2 · gitcafe/zed

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

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

Visibility: public

Requested revision: 5a42ca6772a3275ed4449e563cd6737fcbb81177

Requested commit: 5a42ca6772a3275ed4449e563cd6737fcbb81177

Commit: 5a42ca6772a3275ed4449e563cd6737fcbb81177

Tree: dce33348281721542a33d67fc49eb1a2ce356a58

Author: Marshall Bowers

Committer: Marshall Bowers

## Message

```
Merge branch 'gpui2' of github.com:zed-industries/zed into gpui2

```

## Parents

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

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

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