summary refs log tree commit diff
path: root/synapse
diff options
context:
space:
mode:
authorMark Haines <mark.haines@matrix.org>2015-08-20 17:21:51 +0100
committerMark Haines <mark.haines@matrix.org>2015-08-20 17:21:51 +0100
commit7049e1564faaec452428f733ba02235679d6b54d (patch)
tree7958a7d1396a08b1a319871771dfe5eeedbf82b3 /synapse
parentMerge pull request #239 from matrix-org/pynacl (diff)
parenthacky support for video for FS CC DD (diff)
downloadsynapse-7049e1564faaec452428f733ba02235679d6b54d.tar.xz
Merge remote-tracking branch 'origin/master' into develop
Diffstat (limited to 'synapse')
0 files changed, 0 insertions, 0 deletions