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

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

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

Visibility: public

Requested revision: 2bbce2f0fd45987626fd71b6118ce84474c04a5c

Requested commit: 2bbce2f0fd45987626fd71b6118ce84474c04a5c

Commit: 2bbce2f0fd45987626fd71b6118ce84474c04a5c

Tree: 01dc979298a12071ce4eb1984da607866183b749

Author: Marshall Bowers

Committer: Marshall Bowers

## Message

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

```

## Parents

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

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

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