# Merge branch 'main' into in-app-feedback · gitcafe/zed

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

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

Visibility: public

Requested revision: 5517e743e197da6602de2d4ba6d46fe2182be77c

Requested commit: 5517e743e197da6602de2d4ba6d46fe2182be77c

Commit: 5517e743e197da6602de2d4ba6d46fe2182be77c

Tree: 6c66da53a86a4030ca28f8cab8bb378eadefec76

Author: Joseph Lyons

Committer: Joseph Lyons

## Message

```
Merge branch 'main' into in-app-feedback

```

## Parents

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

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

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