# Merge remote-tracking branch 'origin/main' into zed2-workspace · gitcafe/zed

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

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

Visibility: public

Requested revision: 0bab1a92df984aa7b8e654256228202b2d42ae7e

Requested commit: 0bab1a92df984aa7b8e654256228202b2d42ae7e

Commit: 0bab1a92df984aa7b8e654256228202b2d42ae7e

Tree: f5e89edff13c90f59d40f8104d24870c3c9ae12b

Author: Conrad Irwin

Committer: Conrad Irwin

## Message

```
Merge remote-tracking branch 'origin/main' into zed2-workspace

```

## Parents

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

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

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