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

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

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

Visibility: public

Requested revision: 5e43c332f1712f5a1eb747313f94ee9e95955758

Requested commit: 5e43c332f1712f5a1eb747313f94ee9e95955758

Commit: 5e43c332f1712f5a1eb747313f94ee9e95955758

Tree: dab9d26cab7a7da2bfdf2bd870d412a908ce5c5c

Author: Marshall Bowers

Committer: Marshall Bowers

## Message

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

```

## Parents

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

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

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