aboutsummaryrefslogtreecommitdiffstats
path: root/docs/development
diff options
context:
space:
mode:
authorAlex Gaynor <alex.gaynor@gmail.com>2015-12-07 21:44:30 -0500
committerAlex Gaynor <alex.gaynor@gmail.com>2015-12-07 21:44:30 -0500
commit26c776f71d0f548fdfc9122517923268d740d3af (patch)
treee6f69805f7ee0f5aa5ef7ddc88a8c32709c3854d /docs/development
parente36da1754dc04225f22db46c5b06602db377b429 (diff)
parent3fd2f7ac71ecdf26c7f85d8bce21714949e6933b (diff)
downloadcryptography-26c776f71d0f548fdfc9122517923268d740d3af.tar.gz
cryptography-26c776f71d0f548fdfc9122517923268d740d3af.tar.bz2
cryptography-26c776f71d0f548fdfc9122517923268d740d3af.zip
Merge branch 'master' into pypy-4.0.1
Diffstat (limited to 'docs/development')
0 files changed, 0 insertions, 0 deletions