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

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

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

Visibility: public

Requested revision: 33bc47dbe267f77eaf0dbb282d90c4e9adaaa3a5

Requested commit: 33bc47dbe267f77eaf0dbb282d90c4e9adaaa3a5

Commit: 33bc47dbe267f77eaf0dbb282d90c4e9adaaa3a5

Tree: 02f95a2b7a31a19a1b6bc8b5d7381840dcba278d

Author: Antonio Scandurra

Committer: Antonio Scandurra

## Message

```
Merge branch 'main' into window_context_2

```

## Parents

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

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

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