diff options
| author | Alex Gaynor <alex.gaynor@gmail.com> | 2013-12-14 08:33:54 -0800 |
|---|---|---|
| committer | Alex Gaynor <alex.gaynor@gmail.com> | 2013-12-14 08:33:54 -0800 |
| commit | 4b0f9ab4e733f7183fc0f67acbc251b5d9a56758 (patch) | |
| tree | ad18caf3b26bd57a7cadfbdba4e5edd97d3c49f8 /docs/conf.py | |
| parent | 554df80072ede5e154020af39ce0c664de0582b5 (diff) | |
| parent | ca4a22b4dea8243d02bc4a2699048694e591ae75 (diff) | |
| download | cryptography-4b0f9ab4e733f7183fc0f67acbc251b5d9a56758.tar.gz cryptography-4b0f9ab4e733f7183fc0f67acbc251b5d9a56758.tar.bz2 cryptography-4b0f9ab4e733f7183fc0f67acbc251b5d9a56758.zip | |
Merge branch 'master' into fernet
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} |