# Merge remote-tracking branch 'origin/main' into chat-again · gitcafe/zed

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

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

Visibility: public

Requested revision: fe6f0a253b8b06b361ee0db5619be72e44c8ab26

Requested commit: fe6f0a253b8b06b361ee0db5619be72e44c8ab26

Commit: fe6f0a253b8b06b361ee0db5619be72e44c8ab26

Tree: 31ed8000cbfa5ca6f0d6f309582d9805d3e18e2a

Author: Nathan Sobo

Committer: Nathan Sobo

## Message

```
Merge remote-tracking branch 'origin/main' into chat-again

```

## Parents

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

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

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