# Merge remote-tracking branch 'origin/main' into scrollbars2 · gitcafe/zed

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

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

Visibility: public

Requested revision: 03df63aa0039cfae0bb03ad93059c504c1d9da43

Requested commit: 03df63aa0039cfae0bb03ad93059c504c1d9da43

Commit: 03df63aa0039cfae0bb03ad93059c504c1d9da43

Tree: b955979721be710869aa6b63fca882e02ec36f9e

Author: Antonio Scandurra

Committer: Antonio Scandurra

## Message

```
Merge remote-tracking branch 'origin/main' into scrollbars2

```

## Parents

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

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

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