# Merge branch 'main' into Z-1292/show_search_results_in_scrollbar · gitcafe/zed

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

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

Visibility: public

Requested revision: 8ced7ab00a79d642c4191fd56732d588564a8b6e

Requested commit: 8ced7ab00a79d642c4191fd56732d588564a8b6e

Commit: 8ced7ab00a79d642c4191fd56732d588564a8b6e

Tree: fee39063708534e55794f8de60601f7610512626

Author: Piotr Osiewicz

Committer: Piotr Osiewicz

## Message

```
Merge branch 'main' into Z-1292/show_search_results_in_scrollbar

```

## Parents

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

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

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