diff options
| author | Alex Gaynor <alex.gaynor@gmail.com> | 2014-10-20 21:24:59 -0700 |
|---|---|---|
| committer | Alex Gaynor <alex.gaynor@gmail.com> | 2014-10-20 21:24:59 -0700 |
| commit | c34893c38c853ec341676337d26f5f10257b56b2 (patch) | |
| tree | 0297b213105ad2a6f6de9859b2f0c393b7952273 /tox.ini | |
| parent | 41b33b70d3f9c937d80c264627d1195692a17863 (diff) | |
| parent | 126afca70edc3fac2e493c6b7cd05219c8d8e373 (diff) | |
| download | cryptography-c34893c38c853ec341676337d26f5f10257b56b2.tar.gz cryptography-c34893c38c853ec341676337d26f5f10257b56b2.tar.bz2 cryptography-c34893c38c853ec341676337d26f5f10257b56b2.zip | |
Merge branch 'master' into multi-fernet
Diffstat (limited to 'tox.ini')
0 files changed, 0 insertions, 0 deletions