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

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

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

Visibility: public

Requested revision: c76b9794e4df2c15b6adffee9ba01e8deca5ae2c

Requested commit: c76b9794e4df2c15b6adffee9ba01e8deca5ae2c

Commit: c76b9794e4df2c15b6adffee9ba01e8deca5ae2c

Tree: c08190c4194def647cf9774766c6e48f9d75a04d

Author: Antonio Scandurra

Committer: Antonio Scandurra

## Message

```
Merge branch 'main' into window_context_2

```

## Parents

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

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

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