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

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

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

Visibility: public

Requested revision: 6091caee8e3dc6af25b0f49864bf8e587dc24c92

Requested commit: 6091caee8e3dc6af25b0f49864bf8e587dc24c92

Commit: 6091caee8e3dc6af25b0f49864bf8e587dc24c92

Tree: bb55c0e7b6b6d621705b8c4206364a4a7eb539ad

Author: Max Brunsfeld

Committer: Max Brunsfeld

## Message

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

```

## Parents

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

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

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