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

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

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

Visibility: public

Requested revision: 87cf0cf5ac1a6cde4c9bff409068be5fac2aa1b8

Requested commit: 87cf0cf5ac1a6cde4c9bff409068be5fac2aa1b8

Commit: 87cf0cf5ac1a6cde4c9bff409068be5fac2aa1b8

Tree: fdc352d1cd01f8b4b075b45423d1556d6770b30f

Author: Conrad Irwin

Committer: Conrad Irwin

## Message

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

```

## Parents

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

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

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