# Merge branch 'main' into editor2-autocomplete · gitcafe/zed

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

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

Visibility: public

Requested revision: f2c63781f9619755f185e0054f0b85d0d561f6a6

Requested commit: f2c63781f9619755f185e0054f0b85d0d561f6a6

Commit: f2c63781f9619755f185e0054f0b85d0d561f6a6

Tree: 39d70220e2d0e5e7a70d741f3f9ee6ea4de6d7cb

Author: Antonio Scandurra

Committer: Antonio Scandurra

## Message

```
Merge branch 'main' into editor2-autocomplete

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

```

## Parents

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

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

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