# Merge branch 'main' into quinn/nix · gitcafe/zed

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

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

Visibility: public

Requested revision: b5630eb9016ca620642a9de4106c1f7b86b5602e

Requested commit: b5630eb9016ca620642a9de4106c1f7b86b5602e

Commit: b5630eb9016ca620642a9de4106c1f7b86b5602e

Tree: a6ca9116f6c04cc715f65c388bbe2c1e1c0a6527

Author: Mikayla Maki

Committer: GitHub

## Message

```
Merge branch 'main' into quinn/nix
```

## Parents

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

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

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