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

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

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

Visibility: public

Requested revision: d14dc35efeb509209689719a67b0ad51ee61b71a

Requested commit: d14dc35efeb509209689719a67b0ad51ee61b71a

Commit: d14dc35efeb509209689719a67b0ad51ee61b71a

Tree: 8449db46df554dc958ccad0eca69b56676f11ffc

Author: Marshall Bowers

Committer: Marshall Bowers

## Message

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

```

## Parents

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

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

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