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

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

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

Visibility: public

Requested revision: 9b30f490c761ce51ae4e87caacdd9370987c2690

Requested commit: 9b30f490c761ce51ae4e87caacdd9370987c2690

Commit: 9b30f490c761ce51ae4e87caacdd9370987c2690

Tree: ec64f52982717ac610716b5ad4507fcfc1cd9858

Author: Mikayla

Committer: Mikayla

## Message

```
Merge branch 'main' into add-collab-tests

```

## Parents

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

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

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