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

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

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

Visibility: public

Requested revision: 8f6649e29e21f5808cc4410081e0d1e3ce83ec48

Requested commit: 8f6649e29e21f5808cc4410081e0d1e3ce83ec48

Commit: 8f6649e29e21f5808cc4410081e0d1e3ce83ec48

Tree: f55fefa4edd14f0505127bd99f7cea8bbb721116

Author: Marshall Bowers

Committer: Marshall Bowers

## Message

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

```

## Parents

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

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

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