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

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

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

Visibility: public

Requested revision: a90c0e0326cf9fa78957879522ca39879945409d

Requested commit: a90c0e0326cf9fa78957879522ca39879945409d

Commit: a90c0e0326cf9fa78957879522ca39879945409d

Tree: b4538fbfe70be7d68092ef7d50b65eb5bfdb8091

Author: Mikayla

Committer: Mikayla

## Message

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

```

## Parents

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

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

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