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

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

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

Visibility: public

Requested revision: 5fb8321ee06b5f85417170bb204997086de8cb36

Requested commit: 5fb8321ee06b5f85417170bb204997086de8cb36

Commit: 5fb8321ee06b5f85417170bb204997086de8cb36

Tree: 0abb35ba3a506cb1fc9f11c22d5d89b94c3e2354

Author: Marshall Bowers

Committer: Marshall Bowers

## Message

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

```

## Parents

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

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

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