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

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

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

Visibility: public

Requested revision: cc0bc444b1fa46862b44aedc1b0363a65b23080e

Requested commit: cc0bc444b1fa46862b44aedc1b0363a65b23080e

Commit: cc0bc444b1fa46862b44aedc1b0363a65b23080e

Tree: 6e0a9b4a33a2df7cda45f8137aca44fd143d7d6c

Author: Antonio Scandurra

Committer: Antonio Scandurra

## Message

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

# Conflicts:
#	crates/ui2/src/components/avatar.rs

```

## Parents

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

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

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