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

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

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

Visibility: public

Requested revision: db96fb1307757bc45b51e711cf238de3c6d532ec

Requested commit: db96fb1307757bc45b51e711cf238de3c6d532ec

Commit: db96fb1307757bc45b51e711cf238de3c6d532ec

Tree: 92c632aed025ff8a78352e8eb999f470a845ca78

Author: Nathan Sobo

Committer: Nathan Sobo

## Message

```
Merge remote-tracking branch 'origin/main' into paint-context

```

## Parents

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

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

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