# Merge branch 'main' into pixel-columns · gitcafe/zed

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

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

Visibility: public

Requested revision: 9d07561d99c37bc20bef58685a8d476acff8392e

Requested commit: 9d07561d99c37bc20bef58685a8d476acff8392e

Commit: 9d07561d99c37bc20bef58685a8d476acff8392e

Tree: 9dc1db229841a4c8968323aea3f9f30f69678e36

Author: Conrad Irwin

Committer: Conrad Irwin

## Message

```
Merge branch 'main' into pixel-columns

```

## Parents

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

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

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