# Merge branch 'main' into vim2 · gitcafe/zed

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

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

Visibility: public

Requested revision: af7c93b8d5c9893f468be7dd77e0152ff59d4fbd

Requested commit: af7c93b8d5c9893f468be7dd77e0152ff59d4fbd

Commit: af7c93b8d5c9893f468be7dd77e0152ff59d4fbd

Tree: cf6effd38dced7b1e248db43975e1c1f170b5b95

Author: Conrad Irwin

Committer: Conrad Irwin

## Message

```
Merge branch 'main' into vim2

```

## Parents

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

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

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