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

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

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

Visibility: public

Requested revision: feeb44c12202742cb97383e7c9679e7d7beeeb75

Requested commit: feeb44c12202742cb97383e7c9679e7d7beeeb75

Commit: feeb44c12202742cb97383e7c9679e7d7beeeb75

Tree: 83ebbd595bbbdf0c226d1ba3d730ad44d87320a6

Author: Antonio Scandurra

Committer: Antonio Scandurra

## Message

```
Merge remote-tracking branch 'origin/main' into editor2-rename

# Conflicts:
#	crates/editor2/src/editor.rs
#	crates/editor2/src/element.rs
#	crates/gpui2/src/style.rs

```

## Parents

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

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

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