diff options
| author | Paul Kehrer <paul.l.kehrer@gmail.com> | 2014-01-28 19:00:49 -0600 |
|---|---|---|
| committer | Paul Kehrer <paul.l.kehrer@gmail.com> | 2014-01-28 19:00:49 -0600 |
| commit | 91a6892dde4b2370047547097ac47763a62ed5f0 (patch) | |
| tree | 1627f89b2525aa0893d7ad2411a84866885287fc /tests/conftest.py | |
| parent | aad090fe4273ee80b28f4dc6d1b56cce483c85f7 (diff) | |
| parent | 79777fbfb521154cae072f75970aa53099835edd (diff) | |
| download | cryptography-91a6892dde4b2370047547097ac47763a62ed5f0.tar.gz cryptography-91a6892dde4b2370047547097ac47763a62ed5f0.tar.bz2 cryptography-91a6892dde4b2370047547097ac47763a62ed5f0.zip | |
Merge branch 'master' into pbkdf2-openssl
* master:
Add this to the changelog
Conflicts:
docs/changelog.rst
Diffstat (limited to 'tests/conftest.py')
0 files changed, 0 insertions, 0 deletions