# Merge branch 'main' into collab_ui2 · gitcafe/zed

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

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

Visibility: public

Requested revision: 6d4276ea5fd66d6050c14630229cfcdb198cd55f

Requested commit: 6d4276ea5fd66d6050c14630229cfcdb198cd55f

Commit: 6d4276ea5fd66d6050c14630229cfcdb198cd55f

Tree: 2813fcc8468e280bc469c57222a1841299aff916

Author: Conrad Irwin

Committer: Conrad Irwin

## Message

```
Merge branch 'main' into collab_ui2

```

## Parents

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

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

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