summary refs log tree commit diff
path: root/synapse/rest/client/v2_alpha
diff options
context:
space:
mode:
authorErik Johnston <erik@matrix.org>2016-02-01 15:59:12 +0000
committerErik Johnston <erik@matrix.org>2016-02-01 15:59:12 +0000
commit1ef7cae41b4984f84591a19b0d38f03cfcb1ff0f (patch)
tree2655f4c8f789d5e68448b9239a56e4cac7c209fc /synapse/rest/client/v2_alpha
parentMerge branch 'develop' of github.com:matrix-org/synapse into erikj/sync (diff)
parentMerge pull request #543 from matrix-org/erikj/sync (diff)
downloadsynapse-1ef7cae41b4984f84591a19b0d38f03cfcb1ff0f.tar.xz
Merge branch 'develop' of github.com:matrix-org/synapse into erikj/sync
Diffstat (limited to 'synapse/rest/client/v2_alpha')
0 files changed, 0 insertions, 0 deletions