# Merge branch 'gpui2' into marshall/gpui2-playground · gitcafe/zed

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

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

Visibility: public

Requested revision: 332f3f56172faa76d452673d39bb4966b1ccd1cd

Requested commit: 332f3f56172faa76d452673d39bb4966b1ccd1cd

Commit: 332f3f56172faa76d452673d39bb4966b1ccd1cd

Tree: 124e9f8ff3274011410e787a800488afdec2eb6a

Author: Marshall Bowers

Committer: Marshall Bowers

## Message

```
Merge branch 'gpui2' into marshall/gpui2-playground

```

## Parents

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

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

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