# Merge branch 'main' into collab-ui-refinement · gitcafe/zed

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

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

Visibility: public

Requested revision: 88188b0c309d3f800a25057409c2889264462bb6

Requested commit: 88188b0c309d3f800a25057409c2889264462bb6

Commit: 88188b0c309d3f800a25057409c2889264462bb6

Tree: 54b73e6b4135d43037e132cd6155845c126f74b6

Author: Nate Butler

Committer: Nate Butler

## Message

```
Merge branch 'main' into collab-ui-refinement

```

## Parents

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

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

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