# Merge remote-tracking branch 'origin/main' into no-more-todos-in-editor · gitcafe/zed

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

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

Visibility: public

Requested revision: 1abc876c15fbcf1f3270e00610502150f2290ef8

Requested commit: 1abc876c15fbcf1f3270e00610502150f2290ef8

Commit: 1abc876c15fbcf1f3270e00610502150f2290ef8

Tree: bb6b2bd99e188c612ee88abbdeef04d74237b443

Author: Antonio Scandurra

Committer: Antonio Scandurra

## Message

```
Merge remote-tracking branch 'origin/main' into no-more-todos-in-editor

# Conflicts:
#	crates/editor2/src/items.rs

```

## Parents

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

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

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