# Merge branch 'main' into collab-renames · gitcafe/zed

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

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

Visibility: public

Requested revision: d8e4e924ccedf50b391cf9c4e8fd926159bab500

Requested commit: d8e4e924ccedf50b391cf9c4e8fd926159bab500

Commit: d8e4e924ccedf50b391cf9c4e8fd926159bab500

Tree: 908284626173f4033e1a18e136d45d7db8a426f9

Author: Nathan Sobo

Committer: Nathan Sobo

## Message

```
Merge branch 'main' into collab-renames

```

## Parents

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

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

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