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

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

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

Visibility: public

Requested revision: 37d0b8424c4cc5e226b57b0cebb1af29e8c99af1

Requested commit: 37d0b8424c4cc5e226b57b0cebb1af29e8c99af1

Commit: 37d0b8424c4cc5e226b57b0cebb1af29e8c99af1

Tree: 243acb5d039a6c0b2d0d55194ffdd5796f36543e

Author: Conrad Irwin

Committer: Conrad Irwin

## Message

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

```

## Parents

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

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

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