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

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

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

Visibility: public

Requested revision: a555fa1adacc3fa530d13684eb9123694fa6b59e

Requested commit: a555fa1adacc3fa530d13684eb9123694fa6b59e

Commit: a555fa1adacc3fa530d13684eb9123694fa6b59e

Tree: f4d29bbe494ada683db25063fc8ae81dd2a9cb66

Author: Max Brunsfeld

Committer: Max Brunsfeld

## Message

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

```

## Parents

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

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

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