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

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

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

Visibility: public

Requested revision: 4c27f4453c458eba2cea86dd33894cbdfbe9de4f

Requested commit: 4c27f4453c458eba2cea86dd33894cbdfbe9de4f

Commit: 4c27f4453c458eba2cea86dd33894cbdfbe9de4f

Tree: 8abdf6b4a8be93187b13b6dc1322970dffbaf7b9

Author: Conrad Irwin

Committer: Conrad Irwin

## Message

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

```

## Parents

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

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

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