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

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

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

Visibility: public

Requested revision: 139708d4868629d90d224ce6a10638a2bbc570e1

Requested commit: 139708d4868629d90d224ce6a10638a2bbc570e1

Commit: 139708d4868629d90d224ce6a10638a2bbc570e1

Tree: 1daa7eb609db5a5fedb32f14eaad85a1b59ece99

Author: Conrad Irwin

Committer: Conrad Irwin

## Message

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

```

## Parents

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

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

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