# Merge branch 'main' into collab-titlebar-2 · gitcafe/zed

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

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

Visibility: public

Requested revision: 625814d30a8d29bc63bb9287b974f0fac408e412

Requested commit: 625814d30a8d29bc63bb9287b974f0fac408e412

Commit: 625814d30a8d29bc63bb9287b974f0fac408e412

Tree: 8aaac9021fa99601235508df912cd78a08c91188

Author: Piotr Osiewicz

Committer: Piotr Osiewicz

## Message

```
Merge branch 'main' into collab-titlebar-2

```

## Parents

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

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

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