summary refs log tree commit diff
path: root/scripts
diff options
context:
space:
mode:
authorErik Johnston <erik@matrix.org>2014-09-01 19:57:28 +0100
committerErik Johnston <erik@matrix.org>2014-09-01 19:57:28 +0100
commitf452899fe2a1bcf3f9d3313eeb108660b5cbf677 (patch)
treeedae89fefddc1f820f5bcae8409a85c36f1b2a0e /scripts
parentFix the tests to include new db calls (diff)
parentMerge branch 'server2server_tls' into develop (diff)
downloadsynapse-f452899fe2a1bcf3f9d3313eeb108660b5cbf677.tar.xz
Merge branch 'develop' of github.com:matrix-org/synapse into room_config
Diffstat (limited to 'scripts')
0 files changed, 0 insertions, 0 deletions