# Merge branch 'main' into n/t2 · gitcafe/zed

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

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

Visibility: public

Requested revision: bd4bff47a0a60fabb0330c6d36d31da7cf01bb0e

Requested commit: bd4bff47a0a60fabb0330c6d36d31da7cf01bb0e

Commit: bd4bff47a0a60fabb0330c6d36d31da7cf01bb0e

Tree: dfc3d27c037bc621487b4de02126c1b52f989ad1

Author: Marshall Bowers

Committer: Marshall Bowers

## Message

```
Merge branch 'main' into n/t2

```

## Parents

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

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

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