# Merge branch 'main' into git-project-panel-and-scrollbar-styling · gitcafe/zed

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

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

Visibility: public

Requested revision: 9a47415cb5bb09668f608351cbf7470c61b8b171

Requested commit: 9a47415cb5bb09668f608351cbf7470c61b8b171

Commit: 9a47415cb5bb09668f608351cbf7470c61b8b171

Tree: edf06031c888b42539058348cfaa9a968f98b6a8

Author: Mikayla Maki

Committer: GitHub

## Message

```
Merge branch 'main' into git-project-panel-and-scrollbar-styling
```

## Parents

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

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

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