Merge branch 'master' into flake8

This commit is contained in:
Joseph Frazier
2017-03-08 12:21:54 -05:00
63 changed files with 1060 additions and 113 deletions
+1 -1
View File
@@ -1,5 +1,5 @@
[tox]
envlist = py27,py33,py34,py35
envlist = py27,py33,py34,py35,py36
[testenv]
deps = -rrequirements.txt