# Merge branch 'main' into finally-fix-terminal-line-height · gitcafe/zed

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

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

Visibility: public

Requested revision: f54ab73b47b77d0bd1279b60d76177e071feab58

Requested commit: f54ab73b47b77d0bd1279b60d76177e071feab58

Commit: f54ab73b47b77d0bd1279b60d76177e071feab58

Tree: 68c69d6310217557d5b0d6ff0780016abc422215

Author: Mikayla Maki

Committer: GitHub

## Message

```
Merge branch 'main' into finally-fix-terminal-line-height
```

## Parents

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

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

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