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

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

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

Visibility: public

Requested revision: ca3e73106ca30ed6453ea80a5ff2d09b3c9b1db2

Requested commit: ca3e73106ca30ed6453ea80a5ff2d09b3c9b1db2

Commit: ca3e73106ca30ed6453ea80a5ff2d09b3c9b1db2

Tree: 5c2ba2f9e10335254ea5854866af7552c3718aa6

Author: Antonio Scandurra

Committer: Antonio Scandurra

## Message

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

```

## Parents

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

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

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