# Merge branch 'zed2-room' into zed2 · gitcafe/zed

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

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

Visibility: public

Requested revision: 6172cd9015f711a6dabb2388391aa286406a108b

Requested commit: 6172cd9015f711a6dabb2388391aa286406a108b

Commit: 6172cd9015f711a6dabb2388391aa286406a108b

Tree: 5a657c91435f7fab111746b3b80bda657d3e91da

Author: Antonio Scandurra

Committer: Antonio Scandurra

## Message

```
Merge branch 'zed2-room' into zed2

```

## Parents

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

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

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