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

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

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

Visibility: public

Requested revision: e2a92f4a861103217fc4da37eb7e73ea708e8b92

Requested commit: e2a92f4a861103217fc4da37eb7e73ea708e8b92

Commit: e2a92f4a861103217fc4da37eb7e73ea708e8b92

Tree: 5f76aabbe539bd0120fd69cea4b0b7a3466ef9b4

Author: Nathan Sobo

Committer: Nathan Sobo

## Message

```
Merge remote-tracking branch 'origin/main' into tokio

```

## Parents

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

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

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