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

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

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

Visibility: public

Requested revision: 3198eb6c6dd0e50a846cba371be2b307f219e5e7

Requested commit: 3198eb6c6dd0e50a846cba371be2b307f219e5e7

Commit: 3198eb6c6dd0e50a846cba371be2b307f219e5e7

Tree: 4c69908200fa242eba56ae6eb0d6d1cb80a9dc22

Author: Mikayla

Committer: Mikayla

## Message

```
Merge branch 'main' into splits

```

## Parents

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

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

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