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

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

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

Visibility: public

Requested revision: 01d3432a403eaca26b019d87e07d8ffc5fc1e027

Requested commit: 01d3432a403eaca26b019d87e07d8ffc5fc1e027

Commit: 01d3432a403eaca26b019d87e07d8ffc5fc1e027

Tree: 396dc37ba2623ab7dbad9bda78e3660e1e497ed7

Author: Conrad Irwin

Committer: Conrad Irwin

## Message

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

```

## Parents

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

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

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