Merge branch 'master' into pyup-update-pytest-2.9.2-to-3.2.2 pyup-update-pytest-2.9.2-to-3.2.2
authorDaniel Roy Greenfeld <pydanny@users.noreply.github.com>
Fri, 22 Sep 2017 00:10:21 +0000 (17:10 -0700)
committerGitHub <noreply@github.com>
Fri, 22 Sep 2017 00:10:21 +0000 (17:10 -0700)
commit65fbddb537a6c3d5130c269c20cca86baedd8b51
tree05f45f6216291cbd32469a0d60b5a5083047fe66
parenta0a09820292a0268c3a2c84e416b7d98fd9dacb0
parent9275e626a28b9318a5d69e6b53d6e8ace35c864f
Merge branch 'master' into pyup-update-pytest-2.9.2-to-3.2.2
requirements.txt