# Merge branch 'main' into rename-element-traits · gitcafe/zed

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

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

Visibility: public

Requested revision: 3b918bfee8d4f682ebc746f35f1ebf749256891e

Requested commit: 3b918bfee8d4f682ebc746f35f1ebf749256891e

Commit: 3b918bfee8d4f682ebc746f35f1ebf749256891e

Tree: 12dbad1c893caaf9f3621a3c1fbe0062f69d570e

Author: Antonio Scandurra

Committer: Antonio Scandurra

## Message

```
Merge branch 'main' into rename-element-traits

# Conflicts:
#	crates/gpui2/src/elements/uniform_list.rs
#	crates/ui2/src/components/context_menu.rs
#	crates/ui2/src/components/list.rs

```

## Parents

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

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

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