# Merge branch 'main' into derive-element-redux · gitcafe/zed

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

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

Visibility: public

Requested revision: 0798cfd58cc7226c3db57f32a639e274c77964a1

Requested commit: 0798cfd58cc7226c3db57f32a639e274c77964a1

Commit: 0798cfd58cc7226c3db57f32a639e274c77964a1

Tree: 21378a57ca5f04d73e3511da031e5ed0f8ded18f

Author: Conrad Irwin

Committer: Conrad Irwin

## Message

```
Merge branch 'main' into derive-element-redux

```

## Parents

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

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

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