# Merge branch 'main' into window_context_2 · gitcafe/zed

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

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

Visibility: public

Requested revision: c52b6328b7f79ce7356c1755065eb0c773b7c85d

Requested commit: c52b6328b7f79ce7356c1755065eb0c773b7c85d

Commit: c52b6328b7f79ce7356c1755065eb0c773b7c85d

Tree: 842964acaa08a7a42a1c07e5d68da433c8f95709

Author: Antonio Scandurra

Committer: Antonio Scandurra

## Message

```
Merge branch 'main' into window_context_2

```

## Parents

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

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

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