# Merge branch 'main' into command_palette2 · gitcafe/zed

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

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

Visibility: public

Requested revision: a73265ace4fc47deba9b9316b61a5f75f9aa5b0b

Requested commit: a73265ace4fc47deba9b9316b61a5f75f9aa5b0b

Commit: a73265ace4fc47deba9b9316b61a5f75f9aa5b0b

Tree: cb23249c3639f04eb6ce43de6a38504f3b001bbc

Author: Conrad Irwin

Committer: Conrad Irwin

## Message

```
Merge branch 'main' into command_palette2

```

## Parents

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

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

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