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

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

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

Visibility: public

Requested revision: 5666066db4c5c82c600bda587cf45aeb6baedcad

Requested commit: 5666066db4c5c82c600bda587cf45aeb6baedcad

Commit: 5666066db4c5c82c600bda587cf45aeb6baedcad

Tree: c738a17eafc2dfd9c4f346999a693f4c55628fa9

Author: Marshall Bowers

Committer: Marshall Bowers

## Message

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

```

## Parents

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

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

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