# Merge branch 'main' into gpui-changes · gitcafe/zed

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

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

Visibility: public

Requested revision: bbd0c0d44d7a4c501352473e9b89f21ccecfcede

Requested commit: bbd0c0d44d7a4c501352473e9b89f21ccecfcede

Commit: bbd0c0d44d7a4c501352473e9b89f21ccecfcede

Tree: f41e2bf675bfbf4a9918f2092c8b6736d671a526

Author: Mikayla Maki

Committer: Mikayla Maki

## Message

```
Merge branch 'main' into gpui-changes

```

## Parents

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

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

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