# Merge branch 'main' into settings-file · gitcafe/zed

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

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

Visibility: public

Requested revision: b33a049958baa0e64d6cd49d01e761fc8efd3463

Requested commit: b33a049958baa0e64d6cd49d01e761fc8efd3463

Commit: b33a049958baa0e64d6cd49d01e761fc8efd3463

Tree: 12ee38963072116b62b368e7214f6def0de45eb5

Author: Max Brunsfeld

Committer: Max Brunsfeld

## Message

```
Merge branch 'main' into settings-file

```

## Parents

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

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

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