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

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

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

Visibility: public

Requested revision: 123439adc23bd11d08d2b71bb8354b4e1c4fdfcf

Requested commit: 123439adc23bd11d08d2b71bb8354b4e1c4fdfcf

Commit: 123439adc23bd11d08d2b71bb8354b4e1c4fdfcf

Tree: 3bc97677c88371d945218368e1bc4479560b55f8

Author: Mikayla Maki

Committer: Mikayla

## Message

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

```

## Parents

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

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

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