From: Tom Walker <tomwalker0472@gmail.com>
Date: Sat, 29 Nov 2014 00:10:37 +0000 (+0000)
Subject: Merge pull request #31 from d0ugal/master
X-Git-Url: https://git.parisson.com/?a=commitdiff_plain;h=05761f35c88fe4ce452319fa8fbe2e1d2aec4015;p=django_quiz.git

Merge pull request #31 from d0ugal/master

Update the Travis config to match recent Tox changes
---

05761f35c88fe4ce452319fa8fbe2e1d2aec4015