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

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

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

Visibility: public

Requested revision: f76c9041bb36f1988c00c43fce03d912e5309107

Requested commit: f76c9041bb36f1988c00c43fce03d912e5309107

Commit: f76c9041bb36f1988c00c43fce03d912e5309107

Tree: 724df9f764a5e05a5e7fb21b1c4e26ea3d15db81

Author: Marshall Bowers

Committer: Marshall Bowers

## Message

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

```

## Parents

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

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

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