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

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

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

Visibility: public

Requested revision: c8b452d4119874cbe2d57941ff4825bdcd456b74

Requested commit: c8b452d4119874cbe2d57941ff4825bdcd456b74

Commit: c8b452d4119874cbe2d57941ff4825bdcd456b74

Tree: de53de0780519768a58e18b8344f14233dd446fa

Author: Marshall Bowers

Committer: Marshall Bowers

## Message

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

```

## Parents

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

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

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