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

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

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

Visibility: public

Requested revision: 94293b3bf92fb5a85eb28f157f17052d41bf526e

Requested commit: 94293b3bf92fb5a85eb28f157f17052d41bf526e

Commit: 94293b3bf92fb5a85eb28f157f17052d41bf526e

Tree: 26f367094b16bdf70c95af90a4ee2ba590d01cd0

Author: Antonio Scandurra

Committer: Antonio Scandurra

## Message

```
Merge remote-tracking branch 'origin/main' into cache

# Conflicts:
#	crates/gpui/src/window.rs

```

## Parents

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

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

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