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

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

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

Visibility: public

Requested revision: e6aab57656196de1eea89634a5c1e8e422da3a7f

Requested commit: e6aab57656196de1eea89634a5c1e8e422da3a7f

Commit: e6aab57656196de1eea89634a5c1e8e422da3a7f

Tree: f10714d2cc369a11ee8b8f90154ac16f21c99a99

Author: Conrad Irwin

Committer: Conrad Irwin

## Message

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

```

## Parents

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

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

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