# Merge branch 'main' into keybindings-grind · gitcafe/zed

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

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

Visibility: public

Requested revision: f38206f819ccb473d0fb9b74e71a5714fbe8beb4

Requested commit: f38206f819ccb473d0fb9b74e71a5714fbe8beb4

Commit: f38206f819ccb473d0fb9b74e71a5714fbe8beb4

Tree: ce6cbacd9a0e8b8e638f1a002281dd08fb55618f

Author: Mikayla Maki

Committer: GitHub

## Message

```
Merge branch 'main' into keybindings-grind
```

## Parents

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

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

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