Merge branch '1.11' into 1.12

This commit is contained in:
Jeff Forcier 2014-04-01 13:28:56 -07:00
commit f22fe4b600
1 changed files with 0 additions and 1 deletions

View File

@ -7,7 +7,6 @@ import alabaster
html_theme_path = [alabaster.get_path()]
extensions = ['alabaster']
# Paths relative to invoking conf.py - not this shared file
html_static_path = ['../_shared_static']
html_theme = 'alabaster'
html_theme_options = {
'description': "A Python implementation of SSHv2.",