# Merge branch 'main' into tabs-n-splits · gitcafe/zed

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

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

Visibility: public

Requested revision: 9da0b78ead3604642a2b50a996fadd15c3aa8831

Requested commit: 9da0b78ead3604642a2b50a996fadd15c3aa8831

Commit: 9da0b78ead3604642a2b50a996fadd15c3aa8831

Tree: 9a860ea728a97da791db9458f1ea4de0837f7f38

Author: Mikayla

Committer: Mikayla

## Message

```
Merge branch 'main' into tabs-n-splits

```

## Parents

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

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

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