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

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

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

Visibility: public

Requested revision: 0ced310f939fcba1369a73083a0400b784171353

Requested commit: 0ced310f939fcba1369a73083a0400b784171353

Commit: 0ced310f939fcba1369a73083a0400b784171353

Tree: ccb07411a174b9c8cbc67ae0735d4cda678436eb

Author: Nate Butler

Committer: Nate Butler

## Message

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

```

## Parents

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

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

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