# Merge branch 'main' into overlay-rounding · gitcafe/zed

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

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

Visibility: public

Requested revision: 12f06a96d0dfbf967da15eaa2723823df4c32aca

Requested commit: 12f06a96d0dfbf967da15eaa2723823df4c32aca

Commit: 12f06a96d0dfbf967da15eaa2723823df4c32aca

Tree: 3d17c2c0f0372bfb081709cb61f61263bb3a111d

Author: Conrad Irwin

Committer: Conrad Irwin

## Message

```
Merge branch 'main' into overlay-rounding

```

## Parents

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

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

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