# Merge branch 'main' into reconnections-2 · gitcafe/zed

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

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

Visibility: public

Requested revision: 969c31431578f62ad38f9e18e4fecbf14ad6ac7d

Requested commit: 969c31431578f62ad38f9e18e4fecbf14ad6ac7d

Commit: 969c31431578f62ad38f9e18e4fecbf14ad6ac7d

Tree: d967b9f5b95a0e3df8b56147e4de0090de46e878

Author: Antonio Scandurra

Committer: Antonio Scandurra

## Message

```
Merge branch 'main' into reconnections-2

```

## Parents

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

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

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