summary refs log tree commit diff
path: root/synapse/rest/client/v1
diff options
context:
space:
mode:
authorErik Johnston <erik@matrix.org>2016-07-06 14:50:22 +0100
committerErik Johnston <erik@matrix.org>2016-07-06 14:50:22 +0100
commiteef7778af979827ee7e16b7402529780cc424c57 (patch)
tree13dbf63f60d8bc66a826566299e8201d936238fd /synapse/rest/client/v1
parentMerge branch 'erikj/shared_secret' into erikj/test2 (diff)
parentMerge pull request #909 from matrix-org/erikj/shared_secret (diff)
downloadsynapse-eef7778af979827ee7e16b7402529780cc424c57.tar.xz
Merge branch 'develop' of github.com:matrix-org/synapse into erikj/test2
Diffstat (limited to 'synapse/rest/client/v1')
0 files changed, 0 insertions, 0 deletions