# Merge branch 'main' into channel-guests · gitcafe/zed

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

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

Visibility: public

Requested revision: 3c0052850cebf175319ceb4041c90366f2f635cd

Requested commit: 3c0052850cebf175319ceb4041c90366f2f635cd

Commit: 3c0052850cebf175319ceb4041c90366f2f635cd

Tree: 9a4ea47d7eeda9017d53be825f32b33fdb0fd839

Author: Conrad Irwin

Committer: Conrad Irwin

## Message

```
Merge branch 'main' into channel-guests

```

## Parents

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

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

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