diff options
| author | Alex Gaynor <alex.gaynor@gmail.com> | 2013-08-10 15:54:57 -0400 |
|---|---|---|
| committer | Alex Gaynor <alex.gaynor@gmail.com> | 2013-08-10 15:54:57 -0400 |
| commit | e9d8a777f2db59b11f745eb38d44f7257b40f5ab (patch) | |
| tree | 830d1c621a6dd74427c7f84a14dcfbab17a9550d /tox.ini | |
| parent | 3cae1d6421c3203e85401913aff1a7e02c8f6873 (diff) | |
| parent | ccc5062166f673c0b572c4e3344c8f5a61661d50 (diff) | |
| download | cryptography-e9d8a777f2db59b11f745eb38d44f7257b40f5ab.tar.gz cryptography-e9d8a777f2db59b11f745eb38d44f7257b40f5ab.tar.bz2 cryptography-e9d8a777f2db59b11f745eb38d44f7257b40f5ab.zip | |
Merge branch 'master' into simple-symmetric-encryption
Conflicts:
docs/primitives/symmetric-encryption.rst
Diffstat (limited to 'tox.ini')
0 files changed, 0 insertions, 0 deletions