# Merge branch 'main' into user-menu · gitcafe/zed

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

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

Visibility: public

Requested revision: 7e1d61d116c875534dabe682adf0edab958596ae

Requested commit: 7e1d61d116c875534dabe682adf0edab958596ae

Commit: 7e1d61d116c875534dabe682adf0edab958596ae

Tree: c8df5be08675bdc3a687249dcb31c18ce9af5bea

Author: Conrad Irwin

Committer: Conrad Irwin

## Message

```
Merge branch 'main' into user-menu

```

## Parents

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

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

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