summary refs log tree commit diff
path: root/tests/util
diff options
context:
space:
mode:
authorNeil Johnson <neil@matrix.org>2018-08-08 16:13:03 +0000
committerGitHub <noreply@github.com>2018-08-08 16:13:03 +0000
commit5298d79fb58b8792bc0dd3b4a34b84339d4f4845 (patch)
treedaedd358c898cd879bb5eb365f0f466d6944883b /tests/util
parentMerge branch 'develop' into neilj/disable_hs (diff)
parentMerge pull request #3654 from matrix-org/rav/room_versions (diff)
downloadsynapse-5298d79fb58b8792bc0dd3b4a34b84339d4f4845.tar.xz
Merge branch 'develop' into neilj/disable_hs
Diffstat (limited to 'tests/util')
0 files changed, 0 insertions, 0 deletions