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

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

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

Visibility: public

Requested revision: 3781626379be550e5fd17b0483163d7dbe40094c

Requested commit: 3781626379be550e5fd17b0483163d7dbe40094c

Commit: 3781626379be550e5fd17b0483163d7dbe40094c

Tree: f33ba89a667116e7248a17611d079150812d1a01

Author: Nathan Sobo

Committer: Nathan Sobo

## Message

```
Merge branch 'main' into arena

```

## Parents

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

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

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