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

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

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

Visibility: public

Requested revision: 804c4c512bd6278b51a0cfdbd0dad0a23959b845

Requested commit: 804c4c512bd6278b51a0cfdbd0dad0a23959b845

Commit: 804c4c512bd6278b51a0cfdbd0dad0a23959b845

Tree: 95274e96ee7938c5ee0ca9364b4571f4e59c5f4c

Author: Mikayla Maki

Committer: Mikayla Maki

## Message

```
Merge branch 'main' into ime-stuff

```

## Parents

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

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

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