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

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

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

Visibility: public

Requested revision: 2697862a021ef2e8dc602c9173c257b84a547f3e

Requested commit: 2697862a021ef2e8dc602c9173c257b84a547f3e

Commit: 2697862a021ef2e8dc602c9173c257b84a547f3e

Tree: aae544b32366fef621fa0cb3dfac8c04e29a541a

Author: Antonio Scandurra

Committer: Antonio Scandurra

## Message

```
Merge remote-tracking branch 'origin/main' into editor-movement

```

## Parents

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

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

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