# Merge branch 'main' into terminal-element · gitcafe/zed

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

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

Visibility: public

Requested revision: 6730ff36242a2bd246d328320c4628cd76a9f8e2

Requested commit: 6730ff36242a2bd246d328320c4628cd76a9f8e2

Commit: 6730ff36242a2bd246d328320c4628cd76a9f8e2

Tree: fd5a231a471844b263f16028ea77313329c321b3

Author: Mikayla

Committer: Mikayla

## Message

```
Merge branch 'main' into terminal-element

```

## Parents

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

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

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