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

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

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

Visibility: public

Requested revision: 95342c8c332ffd79bf93812da180e8670405b282

Requested commit: 95342c8c332ffd79bf93812da180e8670405b282

Commit: 95342c8c332ffd79bf93812da180e8670405b282

Tree: 078809840214811e3268007cbfeaafe11218d270

Author: Max Brunsfeld

Committer: Max Brunsfeld

## Message

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

```

## Parents

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

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

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