# Merge branch 'main' into nate/extend-syntax · gitcafe/zed

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

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

Visibility: public

Requested revision: a8a045e8bfe639788a27599cabbbe00575dc8c03

Requested commit: a8a045e8bfe639788a27599cabbbe00575dc8c03

Commit: a8a045e8bfe639788a27599cabbbe00575dc8c03

Tree: 77e15c0874569c27b2206dc2004f445a30d2dfaa

Author: Nate Butler

Committer: Nate Butler

## Message

```
Merge branch 'main' into nate/extend-syntax

```

## Parents

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

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

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