Merge branch 'development'

trolldbois · Jun 25, 2017 · abec5d3 · abec5d3
2 parents c4b6c2e + f9cc218
commit abec5d3
Show file tree

Hide file tree

Showing 28 changed files with 741 additions and 770 deletions.
diff --git a/.travis.yml b/.travis.yml
@@ -76,7 +76,7 @@ before_script:
 script:
 # run tests. Need root for memory dumps tests.
 #  - python setup.py test
-  - coverage run --source=haystack setup.py test
+  - coverage run --source=haystack-reverse setup.py test
 
 after_success:
   - coveralls

diff --git a/README b/README
diff --git a/README.md b/README.md