Merge branch 'master' into yaml

2016-03-19 17:50:55 +01:00 · 2016-03-19 17:50:55 +01:00 · ae2863cf1b
commit ae2863cf1b
parent 5615da7c78 497d647746
2 changed files with 4 additions and 0 deletions
--- a/.gitignore
+++ b/.gitignore
@ -1,3 +1,5 @@
+.cache/
+venv/
 *.pyc
 __pycache__/

--- a/requirements.txt
+++ b/requirements.txt
@ -0,0 +1,2 @@
+pep8
+pytest