# Merge branch 'gpui2' into gpui2-ui · gitcafe/zed

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

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

Visibility: public

Requested revision: 5491398a64c70d04fb89fa5b791af0d9f93c0d15

Requested commit: 5491398a64c70d04fb89fa5b791af0d9f93c0d15

Commit: 5491398a64c70d04fb89fa5b791af0d9f93c0d15

Tree: d59cf406e2fd12f3a36370ff39357359f66fb3ab

Author: Marshall Bowers

Committer: Marshall Bowers

## Message

```
Merge branch 'gpui2' into gpui2-ui

```

## Parents

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

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

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