# Merge branch 'main' into one-themes · gitcafe/zed

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

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

Visibility: public

Requested revision: 53117eb5e57d8f362fe158cdd34d4614dbf7a8b3

Requested commit: 53117eb5e57d8f362fe158cdd34d4614dbf7a8b3

Commit: 53117eb5e57d8f362fe158cdd34d4614dbf7a8b3

Tree: fec391046c9f67220718a0ec375c1e4124a053f2

Author: Marshall Bowers

Committer: Marshall Bowers

## Message

```
Merge branch 'main' into one-themes

```

## Parents

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

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

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