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

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

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

Visibility: public

Requested revision: b0b7f27f3a2ab405b678548951200b1d781a5d20

Requested commit: b0b7f27f3a2ab405b678548951200b1d781a5d20

Commit: b0b7f27f3a2ab405b678548951200b1d781a5d20

Tree: 9bee5a1359d2457d81710a7e2bb2d47dc479c66e

Author: Marshall Bowers

Committer: Marshall Bowers

## Message

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

```

## Parents

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

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

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