# Merge branch 'main' into callback-handles · gitcafe/zed

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

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

Visibility: public

Requested revision: 3e2dba36b404732f0bc42033923aca2416200d98

Requested commit: 3e2dba36b404732f0bc42033923aca2416200d98

Commit: 3e2dba36b404732f0bc42033923aca2416200d98

Tree: 4ca34c0fbb35ceebb54bdbf896276f96985f0763

Author: Conrad Irwin

Committer: Conrad Irwin

## Message

```
Merge branch 'main' into callback-handles

```

## Parents

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

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

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