# Merge branch 'main' into additional-keybinding-icons · gitcafe/zed

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

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

Visibility: public

Requested revision: f39bc6e132052f4beec9fb09046aa5932b054cd8

Requested commit: f39bc6e132052f4beec9fb09046aa5932b054cd8

Commit: f39bc6e132052f4beec9fb09046aa5932b054cd8

Tree: 5d4f5c6d8f48c24e6c5cfc6eb9e3636f79e94687

Author: Nate Butler

Committer: Nate Butler

## Message

```
Merge branch 'main' into additional-keybinding-icons

```

## Parents

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

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

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