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

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

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

Visibility: public

Requested revision: 002458f4c8acbd54d480032cf0462c9e0fe3283d

Requested commit: 002458f4c8acbd54d480032cf0462c9e0fe3283d

Commit: 002458f4c8acbd54d480032cf0462c9e0fe3283d

Tree: 9a4adfb935d6252116a19e6e9d037cc120adb1ce

Author: Marshall Bowers

Committer: Marshall Bowers

## Message

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

```

## Parents

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

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

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