# Merge branch 'main' into perf-2 · gitcafe/zed

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

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

Visibility: public

Requested revision: 8418f25d0a72730e8bee761c20f04b9689af625a

Requested commit: 8418f25d0a72730e8bee761c20f04b9689af625a

Commit: 8418f25d0a72730e8bee761c20f04b9689af625a

Tree: d14a1218b2689cb9b7be2c04c2a4ee49343596ea

Author: Mikayla Maki

Committer: Mikayla

## Message

```
Merge branch 'main' into perf-2

```

## Parents

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

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

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