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

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

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

Visibility: public

Requested revision: aa41f97e383db405ca772e741e2df6ef7d787362

Requested commit: aa41f97e383db405ca772e741e2df6ef7d787362

Commit: aa41f97e383db405ca772e741e2df6ef7d787362

Tree: ba89b2a7fe979d027e9c0a3c8cd1590d57e52a59

Author: Marshall Bowers

Committer: Marshall Bowers

## Message

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

```

## Parents

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

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

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