diff options
| author | Alex Gaynor <alex.gaynor@gmail.com> | 2013-08-11 09:09:10 -0400 |
|---|---|---|
| committer | Alex Gaynor <alex.gaynor@gmail.com> | 2013-08-11 09:09:10 -0400 |
| commit | dc2260344e70f2933f7c3d0568cfd03a12a2c84f (patch) | |
| tree | f045862a0d0e36ed60ce1414c16048a2463f3eb2 /CONTRIBUTING.rst | |
| parent | 4373d7a2939454a976c0fcd08f756f793058d1d5 (diff) | |
| parent | 32d136ef394dcb25a816b0aa76ce2cc113638734 (diff) | |
| download | cryptography-dc2260344e70f2933f7c3d0568cfd03a12a2c84f.tar.gz cryptography-dc2260344e70f2933f7c3d0568cfd03a12a2c84f.tar.bz2 cryptography-dc2260344e70f2933f7c3d0568cfd03a12a2c84f.zip | |
Merge branch 'master' into why-cryptography
Conflicts:
README.rst
Diffstat (limited to 'CONTRIBUTING.rst')
0 files changed, 0 insertions, 0 deletions