# Merge branch 'main' into optimize-large-multi-buffers · gitcafe/zed

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

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

Visibility: public

Requested revision: a58b39f884dfc96c99462467f19ea6f89d320748

Requested commit: a58b39f884dfc96c99462467f19ea6f89d320748

Commit: a58b39f884dfc96c99462467f19ea6f89d320748

Tree: 13b374de64431b17b6b397a9babd0b2192063e14

Author: Antonio Scandurra

Committer: Antonio Scandurra

## Message

```
Merge branch 'main' into optimize-large-multi-buffers

```

## Parents

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

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

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