# Merge branch 'main' into fix-editor-blinking · gitcafe/zed

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

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

Visibility: public

Requested revision: b6b0fea21069fc185200f3db1ca22753a68da06c

Requested commit: b6b0fea21069fc185200f3db1ca22753a68da06c

Commit: b6b0fea21069fc185200f3db1ca22753a68da06c

Tree: 83d81f1892b6c7b894f5988724478be1b127c75f

Author: Max Brunsfeld

Committer: Max Brunsfeld

## Message

```
Merge branch 'main' into fix-editor-blinking

```

## Parents

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

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

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