Merge branch 'master' into black

wsanchez · web-flow · commit 50d25b841a41 · 2020-04-05T20:32:37.000-07:00
diff --git a/.gitignore b/.gitignore
@@ -1,4 +1,4 @@
-/docs/_build
+/docs/_build/
 tmp.py
 *.py[cod]
 
@@ -37,7 +37,10 @@ nosetests.xml
 /.coverage
 /.coverage.*
 /htmlcov/
-/.mypy_cache
+/.mypy_cache/
+
+# Documentation
+/htmldocs/
 
 # Documentation
 /htmldocs/
