summary refs log tree commit diff
path: root/scripts
diff options
context:
space:
mode:
authorMark Haines <mark.haines@matrix.org>2014-10-27 16:56:08 +0000
committerMark Haines <mark.haines@matrix.org>2014-10-27 16:56:08 +0000
commit7c7d9d632669fd7c3456096c504126dfc55b1235 (patch)
tree2e6384548bb98a4ce84676c3fb560d4f71438699 /scripts
parentfix pyflakes warnings (diff)
parentRemove duplicate join_event from create_room (diff)
downloadsynapse-7c7d9d632669fd7c3456096c504126dfc55b1235.tar.xz
Merge branch 'develop' into event_signing
Diffstat (limited to 'scripts')
0 files changed, 0 insertions, 0 deletions