# Merge branch 'main' into add-cursor-position-to-feedback-editor · gitcafe/zed

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

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

Visibility: public

Requested revision: 44c7f162b6b98f32e3743ed474e34f5f60854d9b

Requested commit: 44c7f162b6b98f32e3743ed474e34f5f60854d9b

Commit: 44c7f162b6b98f32e3743ed474e34f5f60854d9b

Tree: bb89ec4204c436ecedc099fea53cc8c95559e14b

Author: Joseph Lyons

Committer: Joseph Lyons

## Message

```
Merge branch 'main' into add-cursor-position-to-feedback-editor

```

## Parents

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

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

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