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

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

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

Visibility: public

Requested revision: 5dda10518269694bfaf51b4cc810f073b033b972

Requested commit: 5dda10518269694bfaf51b4cc810f073b033b972

Commit: 5dda10518269694bfaf51b4cc810f073b033b972

Tree: 7f69dfc53879d7120ef33982e51c81d0d6653a8a

Author: Conrad Irwin

Committer: Conrad Irwin

## Message

```
Merge branch 'main' into element-types

```

## Parents

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

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

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