# Merge branch 'zed2' into gpui2-element-renderer · gitcafe/zed

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

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

Visibility: public

Requested revision: 65389a8fac0f96551c708bf752dcac69a0575392

Requested commit: 65389a8fac0f96551c708bf752dcac69a0575392

Commit: 65389a8fac0f96551c708bf752dcac69a0575392

Tree: b0458b1cc64046b2c7008fb631e74ae5d4ced54b

Author: Marshall Bowers

Committer: Marshall Bowers

## Message

```
Merge branch 'zed2' into gpui2-element-renderer

```

## Parents

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

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

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