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

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

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

Visibility: public

Requested revision: b21b17c120a997d0a6ac655d6d7ae0a4e9b1dd3e

Requested commit: b21b17c120a997d0a6ac655d6d7ae0a4e9b1dd3e

Commit: b21b17c120a997d0a6ac655d6d7ae0a4e9b1dd3e

Tree: c77f0c5fa39b513d4a2aa9b185cf1777a37325f6

Author: Mikayla

Committer: Mikayla

## Message

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

```

## Parents

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

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

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