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

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

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

Visibility: public

Requested revision: c537cf2a57223af1801c5dcd05ff3f75de813d1e

Requested commit: c537cf2a57223af1801c5dcd05ff3f75de813d1e

Commit: c537cf2a57223af1801c5dcd05ff3f75de813d1e

Tree: 8ff36eaf51fafdc17ac7dc1412ba4859007d6ddd

Author: Max Brunsfeld

Committer: Max Brunsfeld

## Message

```
Merge branch 'main' into collab-panel

```

## Parents

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

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

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