summary refs log tree commit diff
path: root/contrib
diff options
context:
space:
mode:
authorDaniel Wagner-Hall <daniel@matrix.org>2015-08-20 16:59:41 +0100
committerDaniel Wagner-Hall <daniel@matrix.org>2015-08-20 16:59:41 +0100
commit4e706ec82c87ec57feac05c87417072106d17154 (patch)
tree0e52c64183fef1d35f904304e302840ad9aac5e9 /contrib
parentMerge branch 'develop' into auth (diff)
parentMerge pull request #239 from matrix-org/pynacl (diff)
downloadsynapse-4e706ec82c87ec57feac05c87417072106d17154.tar.xz
Merge branch 'develop' into auth
Diffstat (limited to 'contrib')
0 files changed, 0 insertions, 0 deletions