diff options
| author | Alex Gaynor <alex.gaynor@gmail.com> | 2013-12-17 07:35:34 -0800 |
|---|---|---|
| committer | Alex Gaynor <alex.gaynor@gmail.com> | 2013-12-17 07:35:34 -0800 |
| commit | 875b36be29e6bcfd1cb2a9cb216aba49c1d9d2f0 (patch) | |
| tree | 71372f15c53afdd4bf2459e9a4774f3d526075a5 /docs/conf.py | |
| parent | 4eec0bb4e1d79f107f40b3856f2c9ec76c3eef88 (diff) | |
| parent | a4aa420cc6c0203d201a0f418af68d1f11abbcf5 (diff) | |
| download | cryptography-875b36be29e6bcfd1cb2a9cb216aba49c1d9d2f0.tar.gz cryptography-875b36be29e6bcfd1cb2a9cb216aba49c1d9d2f0.tar.bz2 cryptography-875b36be29e6bcfd1cb2a9cb216aba49c1d9d2f0.zip | |
Merge branch 'master' into no-more-generator
Conflicts:
tests/hazmat/primitives/utils.py
Diffstat (limited to 'docs/conf.py')
| -rw-r--r-- | docs/conf.py | 1 |
1 files changed, 0 insertions, 1 deletions
diff --git a/docs/conf.py b/docs/conf.py index 77050e72..5092e4d3 100644 --- a/docs/conf.py +++ b/docs/conf.py @@ -257,6 +257,5 @@ texinfo_documents = [ # How to display URL addresses: 'footnote', 'no', or 'inline'. #texinfo_show_urls = 'footnote' - # Example configuration for intersphinx: refer to the Python standard library. intersphinx_mapping = {'http://docs.python.org/': None} |