Merge branch 'master' into develop

This commit is contained in:
Matt Wright
2012-10-11 22:17:00 -04:00
+1 -1
View File
@@ -3,4 +3,4 @@ source-dir = docs/
build-dir = docs/_build
[upload_sphinx]
upload-dir = docs/_build
upload-dir = docs/_build/html