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

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

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

Visibility: public

Requested revision: e6c7e57711e5f83705c3c1337412c298df6fe253

Requested commit: e6c7e57711e5f83705c3c1337412c298df6fe253

Commit: e6c7e57711e5f83705c3c1337412c298df6fe253

Tree: 2289314e4a937e6f86084ad9ae8743e82e464197

Author: Marshall Bowers

Committer: Marshall Bowers

## Message

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

```

## Parents

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

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

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