# Merge branch 'main' into gpui2 · gitcafe/zed

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

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

Visibility: public

Requested revision: f6a4151f6047845f387e6b058612011dd2342d33

Requested commit: f6a4151f6047845f387e6b058612011dd2342d33

Commit: f6a4151f6047845f387e6b058612011dd2342d33

Tree: fbe1cae532ab8d2d7843f4342d8e48e3e9bd2c4a

Author: Marshall Bowers

Committer: Marshall Bowers

## Message

```
Merge branch 'main' into gpui2

```

## Parents

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

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

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