diff options
| author | Alex Gaynor <alex.gaynor@gmail.com> | 2013-11-27 11:36:06 -0600 |
|---|---|---|
| committer | Alex Gaynor <alex.gaynor@gmail.com> | 2013-11-27 11:36:06 -0600 |
| commit | 554df80072ede5e154020af39ce0c664de0582b5 (patch) | |
| tree | c7eab20b0edec9efaa68b7d855713525744193a5 /pytest.ini | |
| parent | ebf3428ebddb7587b5f25497bed73489386126b5 (diff) | |
| parent | 774e2a6ec569c34b30bd9b857826ddb8749d2e9c (diff) | |
| download | cryptography-554df80072ede5e154020af39ce0c664de0582b5.tar.gz cryptography-554df80072ede5e154020af39ce0c664de0582b5.tar.bz2 cryptography-554df80072ede5e154020af39ce0c664de0582b5.zip | |
Merge branch 'master' into fernet
Diffstat (limited to 'pytest.ini')
0 files changed, 0 insertions, 0 deletions