Merge branch 'develop'

ccd-utexas · Jan 24, 2015 · 01a8d50 · 01a8d50
2 parents ae73899 + a174ffc
commit 01a8d50
Show file tree

Hide file tree

Showing 2 changed files with 0 additions and 0 deletions.
diff --git a/docs/binstarsolver.rst → docs/source/binstarsolver.rst b/docs/binstarsolver.rst → docs/source/binstarsolver.rst
diff --git a/docs/modules.rst → docs/source/modules.rst b/docs/modules.rst → docs/source/modules.rst