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

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

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

Visibility: public

Requested revision: 3050c440f42d90ef4028d0e6f96b3d22a7841938

Requested commit: 3050c440f42d90ef4028d0e6f96b3d22a7841938

Commit: 3050c440f42d90ef4028d0e6f96b3d22a7841938

Tree: 1c538b6e0efd8e9d2eea626671b89eb3a589ec52

Author: Mikayla

Committer: Mikayla

## Message

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

```

## Parents

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

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

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