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

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

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

Visibility: public

Requested revision: 1a156c10600a9c379d687e93eb3c9a9e04c52ef8

Requested commit: 1a156c10600a9c379d687e93eb3c9a9e04c52ef8

Commit: 1a156c10600a9c379d687e93eb3c9a9e04c52ef8

Tree: 14e1233bf81b8e12b34a410774dea9e4aa3609f1

Author: Marshall Bowers

Committer: Marshall Bowers

## Message

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

```

## Parents

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

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

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