# Merge branch 'main' into collab_ui-zed2 · gitcafe/zed

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

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

Visibility: public

Requested revision: 390ecb5b0cb032f55793743c00887ed7ea223c98

Requested commit: 390ecb5b0cb032f55793743c00887ed7ea223c98

Commit: 390ecb5b0cb032f55793743c00887ed7ea223c98

Tree: 4bd96d03553e13441448a5595fdec1818b587ba6

Author: Piotr Osiewicz

Committer: Piotr Osiewicz

## Message

```
Merge branch 'main' into collab_ui-zed2

```

## Parents

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

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

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