summary refs log tree commit diff
path: root/scripts-dev
diff options
context:
space:
mode:
authorKrombel <krombel@krombel.de>2018-03-28 14:45:28 +0200
committerKrombel <krombel@krombel.de>2018-03-28 14:45:28 +0200
commit6152e253d842eb4f72be975850450f00c0662e43 (patch)
tree5fa7c6cef720825e05076190c7d0e1f45565a4b5 /scripts-dev
parentmove handling of auto_join_rooms to RegisterHandler (diff)
parentMerge pull request #3042 from matrix-org/fix_locally_failing_tests (diff)
downloadsynapse-6152e253d842eb4f72be975850450f00c0662e43.tar.xz
Merge branch 'develop' of into allow_auto_join_rooms
Diffstat (limited to 'scripts-dev')
0 files changed, 0 insertions, 0 deletions