# Merge branch 'gpui2' into gpui2-ui · gitcafe/zed

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

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

Visibility: public

Requested revision: a6ae6b0752f5957631306fdc913c26966c2c7f4a

Requested commit: a6ae6b0752f5957631306fdc913c26966c2c7f4a

Commit: a6ae6b0752f5957631306fdc913c26966c2c7f4a

Tree: 2b016c9efdc094da014d582b4430d3119b50019c

Author: Marshall Bowers

Committer: Marshall Bowers

## Message

```
Merge branch 'gpui2' into gpui2-ui

```

## Parents

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

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

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