diff options
author | Erik Johnston <erik@matrix.org> | 2015-04-08 16:46:56 +0100 |
---|---|---|
committer | Erik Johnston <erik@matrix.org> | 2015-04-08 16:46:56 +0100 |
commit | a43b40449b5257cec4e2e740c2f90728be84b695 (patch) | |
tree | 805220033f1fcc25dbf88e0356ee3f90ec7a3970 /synapse/crypto/context_factory.py | |
parent | Merge branch 'develop' of github.com:matrix-org/synapse into mysql (diff) | |
parent | Merge branch 'master' of github.com:matrix-org/synapse into develop (diff) | |
download | synapse-a43b40449b5257cec4e2e740c2f90728be84b695.tar.xz |
Merge branch 'develop' of github.com:matrix-org/synapse into mysql
Diffstat (limited to 'synapse/crypto/context_factory.py')
0 files changed, 0 insertions, 0 deletions