# Merge branch 'main' into add-contributing-guide · gitcafe/zed

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

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

Visibility: public

Requested revision: aab464a243b6da3a89b03634e6c67cf01688f747

Requested commit: aab464a243b6da3a89b03634e6c67cf01688f747

Commit: aab464a243b6da3a89b03634e6c67cf01688f747

Tree: 7c7c5ceaf828238b7e6ad114617353def2459033

Author: Joseph T\. Lyons

Committer: Joseph T\. Lyons

## Message

```
Merge branch 'main' into add-contributing-guide

```

## Parents

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

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

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