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

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

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

Visibility: public

Requested revision: 40c634e056555d1912d1a40258e554f3ea4d72b4

Requested commit: 40c634e056555d1912d1a40258e554f3ea4d72b4

Commit: 40c634e056555d1912d1a40258e554f3ea4d72b4

Tree: 359ffc4e1bb80c8acaefba70e261387df9f9a148

Author: Antonio Scandurra

Committer: Antonio Scandurra

## Message

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

```

## Parents

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

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

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