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

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

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

Visibility: public

Requested revision: 136e599051755f364d6ab2c0115ee7161f9eb3d2

Requested commit: 136e599051755f364d6ab2c0115ee7161f9eb3d2

Commit: 136e599051755f364d6ab2c0115ee7161f9eb3d2

Tree: 51959e847655a0fbd6bbec1d00dc89c7795833dc

Author: Antonio Scandurra

Committer: Antonio Scandurra

## Message

```
Merge branch 'main' into window_context_2

```

## Parents

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

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

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