diff options
author | Erik Johnston <erik@matrix.org> | 2015-05-08 16:11:19 +0100 |
---|---|---|
committer | Erik Johnston <erik@matrix.org> | 2015-05-08 16:11:19 +0100 |
commit | 724bb1e7d9c986efbddd2b6ad4dd978213a21c7f (patch) | |
tree | f07d747ac3f5e86b5efdd04c635531fda6ae4c79 /synapse/crypto/keyring.py | |
parent | Drop the old table not the new table (diff) | |
parent | Merge branch 'hotfixes-v0.9.0-r1' of github.com:matrix-org/synapse (diff) | |
download | synapse-724bb1e7d9c986efbddd2b6ad4dd978213a21c7f.tar.xz |
Merge branch 'master' of github.com:matrix-org/synapse into develop
Diffstat (limited to 'synapse/crypto/keyring.py')
0 files changed, 0 insertions, 0 deletions