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

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

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

Visibility: public

Requested revision: 7d97d1dd8dbe19b9ad7e2bdb17be4f66091f28fa

Requested commit: 7d97d1dd8dbe19b9ad7e2bdb17be4f66091f28fa

Commit: 7d97d1dd8dbe19b9ad7e2bdb17be4f66091f28fa

Tree: 08af3073a9a1c8eacc7abf3ec930893b331fedcc

Author: Max Brunsfeld

Committer: Max Brunsfeld

## Message

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

```

## Parents

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

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

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