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

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

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

Visibility: public

Requested revision: 7f72df6dcf8b5c7c59d729027a93da43a99fbdba

Requested commit: 7f72df6dcf8b5c7c59d729027a93da43a99fbdba

Commit: 7f72df6dcf8b5c7c59d729027a93da43a99fbdba

Tree: 3cf469041828911c8d4621f9474ba01b2a130045

Author: Mikayla

Committer: Mikayla

## Message

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

```

## Parents

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

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

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