summary refs log tree commit diff
path: root/synapse
diff options
context:
space:
mode:
authorErik Johnston <erik@matrix.org>2015-11-19 13:08:44 +0000
committerErik Johnston <erik@matrix.org>2015-11-19 13:08:44 +0000
commitc104fd34940f272dc52f817de99550ecc4f64b4e (patch)
tree962a9753b6cf800579b4566b255450e5873ff966 /synapse
parentComment (diff)
parentSpelling (diff)
downloadsynapse-c104fd34940f272dc52f817de99550ecc4f64b4e.tar.xz
Merge branch 'erikj/fix_port_script' into hotfixes-v0.11.0-r2
Diffstat (limited to 'synapse')
0 files changed, 0 insertions, 0 deletions