# Merge branch 'main' into update-pickers · gitcafe/zed

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

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

Visibility: public

Requested revision: 9e6103f863f2df31a0edaa40d33634dfa850aecc

Requested commit: 9e6103f863f2df31a0edaa40d33634dfa850aecc

Commit: 9e6103f863f2df31a0edaa40d33634dfa850aecc

Tree: 82376bebc891b93c006c12ab826b4ba6b496993a

Author: Nate Butler

Committer: Nate Butler

## Message

```
Merge branch 'main' into update-pickers

```

## Parents

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

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

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