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

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

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

Visibility: public

Requested revision: 4ff514ca7e61cf66836b01f5d46307fdcdb4110f

Requested commit: 4ff514ca7e61cf66836b01f5d46307fdcdb4110f

Commit: 4ff514ca7e61cf66836b01f5d46307fdcdb4110f

Tree: d7191137ee64b4716ea67ef02cf84b644fd08f2d

Author: Antonio Scandurra

Committer: Antonio Scandurra

## Message

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

# Conflicts:
#	crates/gpui/src/elements/div.rs

```

## Parents

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

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

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