diff options
| author | Alex Gaynor <alex.gaynor@gmail.com> | 2013-08-12 07:26:16 -0400 |
|---|---|---|
| committer | Alex Gaynor <alex.gaynor@gmail.com> | 2013-08-12 07:26:16 -0400 |
| commit | 0b4df977c1427034760c5237a337f245d021d142 (patch) | |
| tree | 946ad5abc457f3e0a42751add10af508421f922e /docs | |
| parent | 446a457218e3f793f4fec6b73e719c37bfef7d6e (diff) | |
| parent | d1c0188e73debcf73bacca2e338cf5ab9e2c9c04 (diff) | |
| download | cryptography-0b4df977c1427034760c5237a337f245d021d142.tar.gz cryptography-0b4df977c1427034760c5237a337f245d021d142.tar.bz2 cryptography-0b4df977c1427034760c5237a337f245d021d142.zip | |
Merge branch 'master' into simple-symmetric-encryption
Diffstat (limited to 'docs')
| -rw-r--r-- | docs/conf.py | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/docs/conf.py b/docs/conf.py index bd8642c5..16b1109e 100644 --- a/docs/conf.py +++ b/docs/conf.py @@ -25,6 +25,7 @@ # extensions coming with Sphinx (named 'sphinx.ext.*') or your custom ones. extensions = [ 'sphinx.ext.autodoc', + 'sphinx.ext.doctest', 'sphinx.ext.intersphinx', 'sphinx.ext.viewcode', ] |