summary refs log tree commit diff
path: root/tests/rest
diff options
context:
space:
mode:
authorDavid Baker <dave@matrix.org>2015-01-28 16:03:35 +0000
committerDavid Baker <dave@matrix.org>2015-01-28 16:03:35 +0000
commit6840e7ceced60e2b71f6e2ee3df6ba201000332b (patch)
tree20c5fbb04af37045cd70a70197414943d87d0578 /tests/rest
parentMove pushers delta to v12 and bump schema version (diff)
parentAdd matrix.org as a trusted ID server because it's now passed through on port... (diff)
downloadsynapse-6840e7ceced60e2b71f6e2ee3df6ba201000332b.tar.xz
Merge branch 'master' into develop
Diffstat (limited to 'tests/rest')
0 files changed, 0 insertions, 0 deletions