Merge remote-tracking branch 'origin/unstable' into unstable

This commit is contained in:
Jeremy committed 2015-07-12 19:03:22 -06:00
commit f08817f335
2 files changed
+4 -3

No files matched your search

+2 -1
View File
@@ -1 +1,2 @@
Jeremy Grossmann
Jeremy Grossmann
Julien Duponchelle
+2 -2
View File
@@ -1,5 +1,5 @@
[tox]
envlist = py33, py34
envlist = py34
[testenv]
commands = python setup.py test
@@ -9,5 +9,5 @@ deps = -rdev-requirements.txt
ignore = E501,E402
[pytest]
norecursedirs = old_tests .tox
norecursedirs = .tox
timeout = 5