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

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

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

Visibility: public

Requested revision: d375f7992d4c9b5785463d24132665dca1f1cc09

Requested commit: d375f7992d4c9b5785463d24132665dca1f1cc09

Commit: d375f7992d4c9b5785463d24132665dca1f1cc09

Tree: 2d5cca14df72f064166b420457d1bf619ab6d399

Author: Nathan Sobo

Committer: Nathan Sobo

## Message

```
Merge branch 'main' into divs

```

## Parents

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

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

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