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

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

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

Visibility: public

Requested revision: bdf6e8bcc7bec8edb260771118e900a3909665b3

Requested commit: bdf6e8bcc7bec8edb260771118e900a3909665b3

Commit: bdf6e8bcc7bec8edb260771118e900a3909665b3

Tree: a2c9fae3bf68d6c89e6b3708e188795291e35da0

Author: Antonio Scandurra

Committer: Antonio Scandurra

## Message

```
Merge remote-tracking branch 'origin/main' into editor2-paint

```

## Parents

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

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

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