Merge branch 'develop'

ccd-utexas · Jan 24, 2015 · 6760cd5 · 6760cd5
2 parents e802934 + 112aedc
commit 6760cd5
Showing 1 changed file with 1 addition and 0 deletions.
diff --git a/docs/source/conf.py b/docs/source/conf.py
@@ -37,6 +37,7 @@
     'sphinx.ext.mathjax',
     'sphinx.ext.ifconfig',
     'sphinx.ext.viewcode',
+    'numpydoc'
 ]
 
 # Add any paths that contain templates here, relative to this directory.