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

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

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

Visibility: public

Requested revision: d62c51a4b8b8ded7d502642903d444451b7ecfa7

Requested commit: d62c51a4b8b8ded7d502642903d444451b7ecfa7

Commit: d62c51a4b8b8ded7d502642903d444451b7ecfa7

Tree: 08eea5de068e21199fbd24e2fa710c097e00bdaf

Author: Marshall Bowers

Committer: Marshall Bowers

## Message

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

```

## Parents

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

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

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