# Merge branch 'main' into lsp-log-messages · gitcafe/zed

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

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

Visibility: public

Requested revision: afaff7f9a90b69556dd2cdd605ab19397c96e19d

Requested commit: afaff7f9a90b69556dd2cdd605ab19397c96e19d

Commit: afaff7f9a90b69556dd2cdd605ab19397c96e19d

Tree: 74c56c28a4dfc3d6cd2b115630bef947f10e1fa6

Author: Max Brunsfeld

Committer: Max Brunsfeld

## Message

```
Merge branch 'main' into lsp-log-messages

```

## Parents

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

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

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