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

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

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

Visibility: public

Requested revision: 115bd65344780daa525acc634b82d84d5d1382ee

Requested commit: 115bd65344780daa525acc634b82d84d5d1382ee

Commit: 115bd65344780daa525acc634b82d84d5d1382ee

Tree: 51a79270e8f94f58b9688258a83e3f52bf035867

Author: Marshall Bowers

Committer: Marshall Bowers

## Message

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

```

## Parents

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

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

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