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

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

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

Visibility: public

Requested revision: 922d1462a877ac3d13564c20087c72d08a80c401

Requested commit: 922d1462a877ac3d13564c20087c72d08a80c401

Commit: 922d1462a877ac3d13564c20087c72d08a80c401

Tree: 31278cdd0c3412684f587d7aad236efa98b3e157

Author: Marshall Bowers

Committer: Marshall Bowers

## Message

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

```

## Parents

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

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

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