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

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

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

Visibility: public

Requested revision: 097171b9b832a22db20f58cad414007b473546b9

Requested commit: 097171b9b832a22db20f58cad414007b473546b9

Commit: 097171b9b832a22db20f58cad414007b473546b9

Tree: fa900a4446e59f3cb818c0da5286f9c3256a1b02

Author: Antonio Scandurra

Committer: Antonio Scandurra

## Message

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

```

## Parents

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

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

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