diff options
| author | Alex Gaynor <alex.gaynor@gmail.com> | 2014-10-29 13:07:14 -0700 |
|---|---|---|
| committer | Alex Gaynor <alex.gaynor@gmail.com> | 2014-10-29 13:07:14 -0700 |
| commit | a201a2f7312dc542db1e833bfb195fcd2d957ee3 (patch) | |
| tree | 9410249827ef16186adabcf5774f7a7bbd349dd6 /docs/development/index.rst | |
| parent | 6f386b9019f2d6ca8e6ff01a3d0433c9a371732f (diff) | |
| parent | 0ed7f56596bae285e8dd845b6646b44cc73a1609 (diff) | |
| download | cryptography-a201a2f7312dc542db1e833bfb195fcd2d957ee3.tar.gz cryptography-a201a2f7312dc542db1e833bfb195fcd2d957ee3.tar.bz2 cryptography-a201a2f7312dc542db1e833bfb195fcd2d957ee3.zip | |
Merge branch 'master' into use-full-impls
Conflicts:
tests/hazmat/primitives/test_cmac.py
Diffstat (limited to 'docs/development/index.rst')
0 files changed, 0 insertions, 0 deletions