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

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

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

Visibility: public

Requested revision: 111e17b220bbf5a425255dd74c9b183702c87d03

Requested commit: 111e17b220bbf5a425255dd74c9b183702c87d03

Commit: 111e17b220bbf5a425255dd74c9b183702c87d03

Tree: dd0324b3371325e73ee919dfb9d70c06ef41bb28

Author: Mikayla

Committer: Mikayla

## Message

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

```

## Parents

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

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

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