| commit | 64cf4cdcc73f84354a78f2625916caf01ae630ae | [log] [tgz] |
|---|---|---|
| author | Phoebe Queen <foibey@gmail.com> | Wed Aug 12 02:28:43 2015 +0100 |
| committer | Phoebe Queen <foibey@gmail.com> | Wed Aug 12 02:28:43 2015 +0100 |
| tree | 4f5c294e2e644ed1fb8a53dea453826675f39794 | |
| parent | db34d7e3d9e6b13e549866324323e1df8a6e7777 [diff] | |
| parent | 4552fb87830f5c7e3af0532cfd4529b77bf7f988 [diff] |
Merge remote-tracking branch 'upstream/master' into iss2255 Class Extensions was moved while I was adding function. Fixed now. Conflicts: src/cryptography/x509/base.py