# Merge branch 'marshall/merge-main-into-gpui2' into marshall/gpui2-playground · gitcafe/zed

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

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

Visibility: public

Requested revision: 8e94f3902bb1346af69ca6d20ac818ae9c35bc5e

Requested commit: 8e94f3902bb1346af69ca6d20ac818ae9c35bc5e

Commit: 8e94f3902bb1346af69ca6d20ac818ae9c35bc5e

Tree: df646f74a6d0675912829eda91382b2da174375d

Author: Marshall Bowers

Committer: Marshall Bowers

## Message

```
Merge branch 'marshall/merge-main-into-gpui2' into marshall/gpui2-playground

```

## Parents

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

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

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