# Merge branch 'element-types' of github.com:zed-industries/zed into element-types · gitcafe/zed

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

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

Visibility: public

Requested revision: b81b96f35370fc974214173286f446b53e487b3a

Requested commit: b81b96f35370fc974214173286f446b53e487b3a

Commit: b81b96f35370fc974214173286f446b53e487b3a

Tree: 453349caf96fcafd4be07471867d5d8639ef5db0

Author: Mikayla

Committer: Mikayla

## Message

```
Merge branch 'element-types' of github.com:zed-industries/zed into element-types

```

## Parents

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

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

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