# Merge branch 'gpui2' of github.com:zed-industries/zed into gpui2 · gitcafe/zed

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

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

Visibility: public

Requested revision: 70984faee2206484b7f00de4771e8938670c636f

Requested commit: 70984faee2206484b7f00de4771e8938670c636f

Commit: 70984faee2206484b7f00de4771e8938670c636f

Tree: 6d0175da772d60c1f78d9b53b80219bc243b2da9

Author: Marshall Bowers

Committer: Marshall Bowers

## Message

```
Merge branch 'gpui2' of github.com:zed-industries/zed into gpui2

```

## Parents

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

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

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