# Merge branch 'main' into add-new-internal-themes · gitcafe/zed

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

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

Visibility: public

Requested revision: a6e9d0d061ca70fa02c4853cea84ac221b20c9ee

Requested commit: a6e9d0d061ca70fa02c4853cea84ac221b20c9ee

Commit: a6e9d0d061ca70fa02c4853cea84ac221b20c9ee

Tree: 7bdfc938e6988d4c9e5686aa5e4db100b810597c

Author: Nate Butler

Committer: Nate Butler

## Message

```
Merge branch 'main' into add-new-internal-themes

```

## Parents

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

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

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