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

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

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

Visibility: public

Requested revision: aa17adaac9cb4a915b242230cfc51519c404aad5

Requested commit: aa17adaac9cb4a915b242230cfc51519c404aad5

Commit: aa17adaac9cb4a915b242230cfc51519c404aad5

Tree: ef8e31817b27840957fecf484642e6fee4dbef53

Author: Antonio Scandurra

Committer: Antonio Scandurra

## Message

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

```

## Parents

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

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

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