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

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

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

Visibility: public

Requested revision: 49caeeafcec5516f9eb1359e4e0bd37a6acf8f9f

Requested commit: 49caeeafcec5516f9eb1359e4e0bd37a6acf8f9f

Commit: 49caeeafcec5516f9eb1359e4e0bd37a6acf8f9f

Tree: 9d4c8a8ec5f6643aa4741aeb4fbd490ef051e802

Author: Marshall Bowers

Committer: Marshall Bowers

## Message

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

```

## Parents

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

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

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