# Merge branch 'main' into new-button · gitcafe/zed

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

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

Visibility: public

Requested revision: 06b1a7415618352d08d7ee96ba40bfc00463955f

Requested commit: 06b1a7415618352d08d7ee96ba40bfc00463955f

Commit: 06b1a7415618352d08d7ee96ba40bfc00463955f

Tree: 7aa1a6d99609212ae83a4a354c7534d87d0c148e

Author: Mikayla Maki

Committer: Mikayla Maki

## Message

```
Merge branch 'main' into new-button

```

## Parents

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

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

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