diff options
author | Neil Johnson <neil@matrix.org> | 2018-08-08 16:13:03 +0000 |
---|---|---|
committer | GitHub <noreply@github.com> | 2018-08-08 16:13:03 +0000 |
commit | 5298d79fb58b8792bc0dd3b4a34b84339d4f4845 (patch) | |
tree | daedd358c898cd879bb5eb365f0f466d6944883b /demo | |
parent | Merge branch 'develop' into neilj/disable_hs (diff) | |
parent | Merge pull request #3654 from matrix-org/rav/room_versions (diff) | |
download | synapse-5298d79fb58b8792bc0dd3b4a34b84339d4f4845.tar.xz |
Merge branch 'develop' into neilj/disable_hs
Diffstat (limited to 'demo')
0 files changed, 0 insertions, 0 deletions