# Merge branch 'gpui2' into gpui2ui-debug-panel · gitcafe/zed

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

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

Visibility: public

Requested revision: 7ed891e0c6fcf76a92bb36eb5698ad90efb57852

Requested commit: 7ed891e0c6fcf76a92bb36eb5698ad90efb57852

Commit: 7ed891e0c6fcf76a92bb36eb5698ad90efb57852

Tree: c5fdfc5f4b8edcf8de160a3da6416c55a5865b13

Author: Marshall Bowers

Committer: Marshall Bowers

## Message

```
Merge branch 'gpui2' into gpui2ui-debug-panel

```

## Parents

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

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

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