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

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

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

Visibility: public

Requested revision: b5f60b7e50c6e342a4b136d075f055a719dba0a7

Requested commit: b5f60b7e50c6e342a4b136d075f055a719dba0a7

Commit: b5f60b7e50c6e342a4b136d075f055a719dba0a7

Tree: 7ae8a605f6b992ca6705310b6a3fb3ffdfc0e6d7

Author: Nate Butler

Committer: Nate Butler

## Message

```
Merge branch 'main' into update-workspace-styles

```

## Parents

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

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

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