Merge branch 'master' of https://github.com/terrapower/armi into plot…

…Cartesian
terrapower · May 8, 2020 · f69f2f4 · f69f2f4
2 parents cc0f77b + b0368f5
commit f69f2f4
Show file tree

Hide file tree

Showing 54 changed files with 1,003 additions and 1,115 deletions.
diff --git a/.gitignore b/.gitignore
@@ -15,6 +15,8 @@ dist/
 dist-*/
 doc/*.png
 doc/_build
+doc/user/tutorials/anl-afci-177*
+doc/user/tutorials/case-suite
 .apidocs/
 
 # No workspace crumbs.

diff --git a/README.rst b/README.rst
@@ -406,5 +406,5 @@ The ARMI system is licensed as follows:
     :target: https://travis-ci.com/terrapower/armi
 
 .. |Code Coverage| image:: https://coveralls.io/repos/github/terrapower/armi/badge.svg?branch=master
-    :target: https://coveralls.io/github/terrapower/armi?branch=toxCov
+    :target: https://coveralls.io/github/terrapower/armi?branch=master