# Merge branch 'main' into refine-render-traits · gitcafe/zed

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

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

Visibility: public

Requested revision: 406edd279a58e9fbf8f44fff65a1a0f15508e230

Requested commit: 406edd279a58e9fbf8f44fff65a1a0f15508e230

Commit: 406edd279a58e9fbf8f44fff65a1a0f15508e230

Tree: ef6d1b38f7a1036128ba527b55ef98ad4f44c1db

Author: Piotr Osiewicz

Committer: Piotr Osiewicz

## Message

```
Merge branch 'main' into refine-render-traits

```

## Parents

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

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

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