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

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

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

Visibility: public

Requested revision: 364e3e7de59145848602d4df7b06999a023ad217

Requested commit: 364e3e7de59145848602d4df7b06999a023ad217

Commit: 364e3e7de59145848602d4df7b06999a023ad217

Tree: 56130bd72207ecb9accde1a97e689dbb24399765

Author: Nathan Sobo

Committer: Nathan Sobo

## Message

```
Merge remote-tracking branch 'origin/main' into element-types

```

## Parents

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

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

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