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

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

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

Visibility: public

Requested revision: dbe06fe5fca2660be4cab589a82508e1b1ea0291

Requested commit: dbe06fe5fca2660be4cab589a82508e1b1ea0291

Commit: dbe06fe5fca2660be4cab589a82508e1b1ea0291

Tree: 13101f24dd231595a4679040cf5bc5a2d12f018d

Author: Conrad Irwin

Committer: Conrad Irwin

## Message

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

```

## Parents

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

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

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