# Merge branch 'main' into import-theme · gitcafe/zed

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

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

Visibility: public

Requested revision: b4e23689430e6ebae7f9c337154a3ca893040a63

Requested commit: b4e23689430e6ebae7f9c337154a3ca893040a63

Commit: b4e23689430e6ebae7f9c337154a3ca893040a63

Tree: f45b0bc428688de90373c4259a50bd4253297295

Author: Nate Butler

Committer: Nate Butler

## Message

```
Merge branch 'main' into import-theme

```

## Parents

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

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

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