summary refs log tree commit diff
path: root/contrib
diff options
context:
space:
mode:
authorErik Johnston <erik@matrix.org>2016-08-04 14:04:35 +0100
committerErik Johnston <erik@matrix.org>2016-08-04 14:04:35 +0100
commitb4e2290d8951822bb3309b99830a775d9e5826e2 (patch)
tree5333716daa806065b5a59c4815a022b855032e3e /contrib
parentTidy up get_events (diff)
parentMerge pull request #982 from matrix-org/erikj/fix_port_script (diff)
downloadsynapse-b4e2290d8951822bb3309b99830a775d9e5826e2.tar.xz
Merge branch 'develop' of github.com:matrix-org/synapse into erikj/state_ids_api
Diffstat (limited to 'contrib')
0 files changed, 0 insertions, 0 deletions