aboutsummaryrefslogtreecommitdiffstats
path: root/docs/conf.py
diff options
context:
space:
mode:
authorAlex Gaynor <alex.gaynor@gmail.com>2013-11-27 11:36:20 -0600
committerAlex Gaynor <alex.gaynor@gmail.com>2013-11-27 11:36:20 -0600
commit973499aded3ce3580a8c6d44aa111288240f90a1 (patch)
tree5bd90654b015a954936e1dac7ddedd235f22a3b9 /docs/conf.py
parentbb30eb160045181b0c91fc9f2d8f374d65c2c13b (diff)
parent774e2a6ec569c34b30bd9b857826ddb8749d2e9c (diff)
downloadcryptography-973499aded3ce3580a8c6d44aa111288240f90a1.tar.gz
cryptography-973499aded3ce3580a8c6d44aa111288240f90a1.tar.bz2
cryptography-973499aded3ce3580a8c6d44aa111288240f90a1.zip
Merge branch 'master' into validate-iv
Diffstat (limited to 'docs/conf.py')
0 files changed, 0 insertions, 0 deletions