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

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

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

Visibility: public

Requested revision: 99daa73325a0aea96660ae042e6ba66795351549

Requested commit: 99daa73325a0aea96660ae042e6ba66795351549

Commit: 99daa73325a0aea96660ae042e6ba66795351549

Tree: 382b2431896fe8b8ce4b1e520e89b7646567d8b7

Author: Mikayla

Committer: Mikayla

## Message

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

```

## Parents

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

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

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