# Merge remote-tracking branch 'origin/main' into gpui2-image-reborrow · gitcafe/zed

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

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

Visibility: public

Requested revision: 1dd20d4c0aa2150a68f2e3b373bc877f5ad8955a

Requested commit: 1dd20d4c0aa2150a68f2e3b373bc877f5ad8955a

Commit: 1dd20d4c0aa2150a68f2e3b373bc877f5ad8955a

Tree: 936b90ed8b54c2fc29d0ea4f513fdf3edd00aaf0

Author: Nathan Sobo

Committer: Nathan Sobo

## Message

```
Merge remote-tracking branch 'origin/main' into gpui2-image-reborrow

```

## Parents

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

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

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