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

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

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

Visibility: public

Requested revision: 6ed60769ac463c2d223d7ae546a4b68604c75f61

Requested commit: 6ed60769ac463c2d223d7ae546a4b68604c75f61

Commit: 6ed60769ac463c2d223d7ae546a4b68604c75f61

Tree: 58420685251e33e13db474640d2f389d8961fc44

Author: Marshall Bowers

Committer: Marshall Bowers

## Message

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

```

## Parents

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

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

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