diff options
| author | David Baker <dave@matrix.org> | 2017-10-02 16:20:41 +0100 |
|---|---|---|
| committer | David Baker <dave@matrix.org> | 2017-10-02 16:20:41 +0100 |
| commit | 27955056e092b440ed00da13fe6326dd438bb900 (patch) | |
| tree | 8480cf26404b89993e6ffa6cadbabc477be19661 /demo | |
| parent | Merge pull request #2472 from matrix-org/erikj/groups_rooms (diff) | |
| parent | Merge pull request #2480 from matrix-org/rav/federation_client_logging (diff) | |
| download | synapse-27955056e092b440ed00da13fe6326dd438bb900.tar.xz | |
Merge branch 'develop' into erikj/groups_merged
Diffstat (limited to 'demo')
0 files changed, 0 insertions, 0 deletions