Merge branch 'master' into show-code-license

njsmith · web-flow · commit 310456a18835 · 2018-04-03T22:59:56.000-07:00
diff --git a/.gitignore b/.gitignore
@@ -47,6 +47,7 @@ htmlcov/
 .cache
 nosetests.xml
 coverage.xml
+.pytest_cache
 
 # Translations
 *.mo
