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

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

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

Visibility: public

Requested revision: cd60d466b1db728a3f4b72f8c19bb373a3da6ff4

Requested commit: cd60d466b1db728a3f4b72f8c19bb373a3da6ff4

Commit: cd60d466b1db728a3f4b72f8c19bb373a3da6ff4

Tree: bb960a7c0ad5e0d9e3a615041bb02a1944881647

Author: Conrad Irwin

Committer: Conrad Irwin

## Message

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

```

## Parents

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

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

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