# Merge branch 'main' into pane-toolbar-tabbar-ui · gitcafe/zed

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

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

Visibility: public

Requested revision: e0ca7f844a13ed7d85a57cdcc9456700086717f5

Requested commit: e0ca7f844a13ed7d85a57cdcc9456700086717f5

Commit: e0ca7f844a13ed7d85a57cdcc9456700086717f5

Tree: 2f405a99a62c64a7a4942b0f0fbbc48242c779ed

Author: Marshall Bowers

Committer: Marshall Bowers

## Message

```
Merge branch 'main' into pane-toolbar-tabbar-ui

```

## Parents

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

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

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