# Merge pull request \#1700 from zed-industries/room · gitcafe/zed

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

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

Visibility: public

Requested revision: a656047c15eded51fa5c58940065bc8096345fce

Requested commit: a656047c15eded51fa5c58940065bc8096345fce

Commit: a656047c15eded51fa5c58940065bc8096345fce

Tree: 4796066179e584615e6b5b58179a17c550ac2986

Author: Antonio Scandurra

Committer: GitHub

## Message

```
Merge pull request #1700 from zed-industries/room

Introduce call-based collaboration
```

## Parents

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

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

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