# Merge branch 'zed2' of github.com:zed-industries/zed into zed2 · gitcafe/zed

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

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

Visibility: public

Requested revision: 6784ccd9fe3f40e9e2ff5156b50ad6d0ac6d88fb

Requested commit: 6784ccd9fe3f40e9e2ff5156b50ad6d0ac6d88fb

Commit: 6784ccd9fe3f40e9e2ff5156b50ad6d0ac6d88fb

Tree: 0b50051a56a7cfe102e760ebeed8fc7bf7e40d75

Author: Marshall Bowers

Committer: Marshall Bowers

## Message

```
Merge branch 'zed2' of github.com:zed-industries/zed into zed2

```

## Parents

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

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

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