# Merge branch 'main' into ime-support-2 · gitcafe/zed

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

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

Visibility: public

Requested revision: 7b009c8bbeaa71874658dcb7e963f6b59657eb32

Requested commit: 7b009c8bbeaa71874658dcb7e963f6b59657eb32

Commit: 7b009c8bbeaa71874658dcb7e963f6b59657eb32

Tree: 86e6e123563855d52f3b5c171d9fcb794b4392ad

Author: Antonio Scandurra

Committer: Antonio Scandurra

## Message

```
Merge branch 'main' into ime-support-2

```

## Parents

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

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

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