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

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

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

Visibility: public

Requested revision: fafc10d57ca2ff03f1d21d3f365b923eb231ba59

Requested commit: fafc10d57ca2ff03f1d21d3f365b923eb231ba59

Commit: fafc10d57ca2ff03f1d21d3f365b923eb231ba59

Tree: 244de17892ab21fb40d746179a080fd7f8ea36be

Author: Max Brunsfeld

Committer: Max Brunsfeld

## Message

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

```

## Parents

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

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

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