Merge branch 'feature-normal-science-backport' into feature-gui

2017-11-18 18:32:13 -07:00
parent ff152c6398 4388bede7d
commit ec9e0c333e
19 changed files with 562 additions and 168 deletions
@@ -19,6 +19,7 @@ pip-log.txt
 # Unit test / coverage reports
 .coverage
 .tox
+.log

 # Other filesystems
 .svn