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

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

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

Visibility: public

Requested revision: afbbb1c41f62a7c7af09acc70b770f54cfe85112

Requested commit: afbbb1c41f62a7c7af09acc70b770f54cfe85112

Commit: afbbb1c41f62a7c7af09acc70b770f54cfe85112

Tree: 8cfa1da5c0de1b60ab8bbd409d3ef21026f9893c

Author: Marshall Bowers

Committer: Marshall Bowers

## Message

```
Merge branch 'main' into collab-titlebar-fixes

```

## Parents

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

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

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