diff options
| author | Alex Gaynor <alex.gaynor@gmail.com> | 2014-10-24 07:49:33 -0700 |
|---|---|---|
| committer | Alex Gaynor <alex.gaynor@gmail.com> | 2014-10-24 07:49:33 -0700 |
| commit | f484d1ef03bc548dde300a59c91474d82169b1be (patch) | |
| tree | f3d79d1c6a22db5b90a5810ffe1a432be9c912df /docs/development | |
| parent | 971b98d40ed1cb6b6eecba7a83c0ff4a1ef89c5f (diff) | |
| parent | 2f2346344ae5561bc9b106cbb452efeebe3cdc45 (diff) | |
| download | cryptography-f484d1ef03bc548dde300a59c91474d82169b1be.tar.gz cryptography-f484d1ef03bc548dde300a59c91474d82169b1be.tar.bz2 cryptography-f484d1ef03bc548dde300a59c91474d82169b1be.zip | |
Merge branch 'master' into verify-interfaces
Conflicts:
cryptography/hazmat/primitives/hmac.py
Diffstat (limited to 'docs/development')
0 files changed, 0 insertions, 0 deletions