]> git.parisson.com Git - django_quiz.git/commitdiff
Merge branch 'dev' of https://github.com/tomwalker/django-quiz into dev
authortomwalker <tomwalker0472@gmail.com>
Thu, 31 Jul 2014 15:04:28 +0000 (16:04 +0100)
committertomwalker <tomwalker0472@gmail.com>
Thu, 31 Jul 2014 15:04:28 +0000 (16:04 +0100)

Trivial merge