# Merge branch 'gpui2' into gpui2-theme-to-color · gitcafe/zed

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

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

Visibility: public

Requested revision: 3932c1064e339b457b9a148cef91becb6b12a206

Requested commit: 3932c1064e339b457b9a148cef91becb6b12a206

Commit: 3932c1064e339b457b9a148cef91becb6b12a206

Tree: a27f49ae61444a73d7d68dd67444cb159f14db46

Author: Marshall Bowers

Committer: Marshall Bowers

## Message

```
Merge branch 'gpui2' into gpui2-theme-to-color

```

## Parents

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

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

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