diff options
| author | Mark Haines <mark.haines@matrix.org> | 2015-08-20 17:21:51 +0100 |
|---|---|---|
| committer | Mark Haines <mark.haines@matrix.org> | 2015-08-20 17:21:51 +0100 |
| commit | 7049e1564faaec452428f733ba02235679d6b54d (patch) | |
| tree | 7958a7d1396a08b1a319871771dfe5eeedbf82b3 /synapse | |
| parent | Merge pull request #239 from matrix-org/pynacl (diff) | |
| parent | hacky support for video for FS CC DD (diff) | |
| download | synapse-7049e1564faaec452428f733ba02235679d6b54d.tar.xz | |
Merge remote-tracking branch 'origin/master' into develop
Diffstat (limited to 'synapse')
0 files changed, 0 insertions, 0 deletions