summary refs log tree commit diff
path: root/synapse/rest
diff options
context:
space:
mode:
authorRichard van der Hoff <richard@matrix.org>2016-12-12 11:46:46 +0000
committerRichard van der Hoff <richard@matrix.org>2016-12-12 11:46:46 +0000
commit9240948346b86c5291b90169fea6e493337aab91 (patch)
tree94993bd34deaf7c22b22d089f8c89854f5fea9e1 /synapse/rest
parentMerge pull request #1620 from matrix-org/erikj/concurrent_room_access (diff)
parentMerge pull request #1685 from matrix-org/rav/update_readme_for_tests (diff)
downloadsynapse-9240948346b86c5291b90169fea6e493337aab91.tar.xz
Merge remote-tracking branch 'origin/master' into develop
Diffstat (limited to 'synapse/rest')
0 files changed, 0 insertions, 0 deletions