Merge branch 'master' into multi-server

2015-12-24 15:13:35 -05:00 · 2015-12-24 15:13:35 -05:00 · 8dc7b3cee1
parent 6df1425897 66a828b4d4
commit 8dc7b3cee1
1 changed files with 2 additions and 2 deletions
--- a/docs/conf.py
+++ b/docs/conf.py
@ -101,8 +101,8 @@ pygments_style = 'sphinx'

 # The theme to use for HTML and HTML Help pages.  See the documentation for
 # a list of builtin themes.
-#html_theme = 'default'
-html_theme = 'sphinx_rtd_theme'
+html_theme = 'default'
+#html_theme = 'sphinx_rtd_theme'

 # Theme options are theme-specific and customize the look and feel of a theme
 # further.  For a list of options available for each theme, see the