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

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

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

Visibility: public

Requested revision: 1c260e6dfd0e97b1b7d53724b7ec69b12ef4c1ae

Requested commit: 1c260e6dfd0e97b1b7d53724b7ec69b12ef4c1ae

Commit: 1c260e6dfd0e97b1b7d53724b7ec69b12ef4c1ae

Tree: 7b7aad72b6bdf1b7bf6e26b8fa6c504137bea80c

Author: Antonio Scandurra

Committer: Antonio Scandurra

## Message

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

# Conflicts:
#	crates/copilot/src/sign_in.rs
#	crates/gpui/src/window.rs
#	crates/workspace/src/pane_group.rs

```

## Parents

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

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

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