diff options
author | David Baker <dave@matrix.org> | 2016-02-26 13:40:25 +0000 |
---|---|---|
committer | David Baker <dave@matrix.org> | 2016-02-26 13:40:25 +0000 |
commit | 413e36b17afd49d0383cbfd8b8104e9f52a35d98 (patch) | |
tree | 8f9fad5d45310e0acf5059e5867a57b5889e694b /synapse/crypto/keyclient.py | |
parent | Empty to commit to force re-test (diff) | |
parent | Merge pull request #608 from gergelypolonkai/syn-638 (diff) | |
download | synapse-413e36b17afd49d0383cbfd8b8104e9f52a35d98.tar.xz |
Merge remote-tracking branch 'origin/develop' into dbkr/send_inviter_member_event
Diffstat (limited to 'synapse/crypto/keyclient.py')
0 files changed, 0 insertions, 0 deletions