summary refs log tree commit diff
path: root/contrib
diff options
context:
space:
mode:
authorDaniel Wagner-Hall <daniel@matrix.org>2015-10-20 12:00:22 +0100
committerDaniel Wagner-Hall <daniel@matrix.org>2015-10-20 12:00:22 +0100
commitf510586372ca61fa47aa5d5025b7ae7a989d9475 (patch)
tree0197d285e6cd36f33ccc77c13c4631ff48b95b5b /contrib
parentAllow rejecting invites (diff)
parentMerge pull request #315 from matrix-org/paul/test-vectors (diff)
downloadsynapse-f510586372ca61fa47aa5d5025b7ae7a989d9475.tar.xz
Merge branch 'develop' of github.com:matrix-org/synapse into develop
Diffstat (limited to 'contrib')
0 files changed, 0 insertions, 0 deletions