Merge branch 'master' into docs

[philo.git] / .gitignore

diff --git a/.gitignore b/.gitignore
index 0d20b64..073067c 100644 (file)
--- a/.gitignore
+++ b/.gitignore
@@ -1 +1,2 @@
 *.pyc
+docs/_build/