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

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

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

Visibility: public

Requested revision: f2a5a4d0fd56e6b71a9f0a7f5e78f4b5d373387d

Requested commit: f2a5a4d0fd56e6b71a9f0a7f5e78f4b5d373387d

Commit: f2a5a4d0fd56e6b71a9f0a7f5e78f4b5d373387d

Tree: 2bf3cf848064fe19accb41500e608a4c12ec87fe

Author: Joseph Lyons

Committer: Joseph Lyons

## Message

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

```

## Parents

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

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

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